← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Factor out _type_equality_funcs to a new function

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
80
80
 
81
81
 
82
82
resolve_action_registry.register(
83
 
    'done', 'done', 'Marks the conflict as resolved.')
 
83
    'done', 'done', 'Marks the conflict as resolved' )
84
84
resolve_action_registry.register(
85
85
    'take-this', 'take_this',
86
 
    'Resolve the conflict preserving the version in the working tree.')
 
86
    'Resolve the conflict preserving the version in the working tree' )
87
87
resolve_action_registry.register(
88
88
    'take-other', 'take_other',
89
 
    'Resolve the conflict taking the merged version into account.')
 
89
    'Resolve the conflict taking the merged version into account' )
90
90
resolve_action_registry.default_key = 'done'
91
91
 
92
92
class ResolveActionOption(option.RegistryOption):
146
146
            if file_list is None:
147
147
                un_resolved, resolved = tree.auto_resolve()
148
148
                if len(un_resolved) > 0:
149
 
                    trace.note(ngettext('%d conflict auto-resolved.',
150
 
                        '%d conflicts auto-resolved.', len(resolved)),
151
 
                        len(resolved))
 
149
                    trace.note(gettext('%d conflict(s) auto-resolved.'), len(resolved))
152
150
                    trace.note(gettext('Remaining conflicts:'))
153
151
                    for conflict in un_resolved:
154
152
                        trace.note(unicode(conflict))