← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
21
21
 
22
22
from bzrlib import (
23
23
    osutils,
 
24
    registry,
24
25
    )
25
26
from bzrlib.branch import Branch
26
27
from bzrlib.conflicts import ConflictList, Conflict
961
962
    merger.other_basis = other_rev_id
962
963
    return merger.do_merge()
963
964
 
964
 
 
965
 
merge_types = {     "merge3": (Merge3Merger, "Native diff3-style merge"), 
966
 
                     "diff3": (Diff3Merger,  "Merge using external diff3"),
967
 
                     'weave': (WeaveMerger, "Weave-based merge")
968
 
              }
969
 
 
970
 
 
971
 
def merge_type_help():
972
 
    templ = '%s%%7s: %%s' % (' '*12)
973
 
    lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
974
 
    return '\n'.join(lines)
 
965
def get_merge_type_registry():
 
966
    """Merge type registry is in bzrlib.option to avoid circular imports.
 
967
 
 
968
    This method provides a sanctioned way to retrieve it.
 
969
    """
 
970
    from bzrlib import option
 
971
    return option._merge_type_registry