← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-10-02 17:28:44 UTC
  • mfrom: (3744.2.2 merge_reprocess)
  • Revision ID: pqm@pqm.ubuntu.com-20081002172844-d6df1l8dzpsqzyup
(jam) For 'bzr merge' enable '--reprocess' by default whenever
        '--show-base' is not set.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2904
2904
    ]
2905
2905
 
2906
2906
    def run(self, location=None, revision=None, force=False,
2907
 
            merge_type=None, show_base=False, reprocess=False, remember=False,
 
2907
            merge_type=None, show_base=False, reprocess=None, remember=False,
2908
2908
            uncommitted=False, pull=False,
2909
2909
            directory=None,
2910
2910
            preview=False,
3013
3013
            not merger.merge_type is _mod_merge.Merge3Merger):
3014
3014
            raise errors.BzrCommandError("Show-base is not supported for this"
3015
3015
                                         " merge type. %s" % merger.merge_type)
 
3016
        if merger.reprocess is None:
 
3017
            if merger.show_base:
 
3018
                merger.reprocess = False
 
3019
            else:
 
3020
                # Use reprocess if the merger supports it
 
3021
                merger.reprocess = merger.merge_type.supports_reprocess
3016
3022
        if merger.reprocess and not merger.merge_type.supports_reprocess:
3017
3023
            raise errors.BzrCommandError("Conflict reduction is not supported"
3018
3024
                                         " for merge type %s." %