← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Moved the merge stuff into merge.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
30
30
                           NotBranchError, DivergedBranches, NotConflicted,
31
31
                           NoSuchFile, NoWorkingTree, FileInWrongBranch)
32
32
from bzrlib.log import show_one_log
 
33
from bzrlib.merge import Merge3Merger
33
34
from bzrlib.option import Option
34
35
from bzrlib.revisionspec import RevisionSpec
35
36
import bzrlib.trace
36
37
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
37
 
from bzrlib.transform import Merge3Merger
38
38
from bzrlib.transport.local import LocalTransport
39
39
from bzrlib.workingtree import WorkingTree
40
40
 
1610
1610
 
1611
1611
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1612
1612
            show_base=False, reprocess=False):
1613
 
        from bzrlib.transform import Merge3Merger
1614
1613
        if merge_type is None:
1615
1614
            merge_type = Merge3Merger
1616
1615
        if branch is None:
1667
1666
    def run(self, file_list=None, merge_type=None, show_base=False,
1668
1667
            reprocess=False):
1669
1668
        from bzrlib.merge import merge_inner, transform_tree
1670
 
        from bzrlib.transform import Merge3Merger
1671
1669
        if merge_type is None:
1672
1670
            merge_type = Merge3Merger
1673
1671
        tree, file_list = tree_files(file_list)