← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-12 22:03:29 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912220329-0683bcd6066fc117
lazy import versionedfile, late-load bzrlib.merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2747
2747
def _merge_helper(other_revision, base_revision,
2748
2748
                  check_clean=True, ignore_zero=False,
2749
2749
                  this_dir=None, backup_files=False,
2750
 
                  merge_type=_mod_merge.Merge3Merger,
 
2750
                  merge_type=None,
2751
2751
                  file_list=None, show_base=False, reprocess=False,
2752
2752
                  pb=DummyProgress()):
2753
2753
    """Merge changes into a tree.
2777
2777
    clients might prefer to call merge.merge_inner(), which has less magic 
2778
2778
    behavior.
2779
2779
    """
 
2780
    # Loading it late, so that we don't always have to import bzrlib.merge
 
2781
    if merge_type is None:
 
2782
        merge_type = _mod_merge.Merge3Merger
2780
2783
    if this_dir is None:
2781
2784
        this_dir = u'.'
2782
2785
    this_tree = WorkingTree.open_containing(this_dir)[0]