← 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: 2007-08-06 04:01:04 UTC
  • mfrom: (2665.2.1 nameerror-in-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20070806040104-af06p8gf7bsb3eze
(robertc) Merge Michael Hudson's merge --weave --show-base error output fix. (Michael Hudson)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2722
2722
        if (merger.show_base and
2723
2723
            not merger.merge_type is _mod_merge.Merge3Merger):
2724
2724
            raise errors.BzrCommandError("Show-base is not supported for this"
2725
 
                                         " merge type. %s" % merge_type)
 
2725
                                         " merge type. %s" % merger.merge_type)
2726
2726
        if merger.reprocess and not merger.merge_type.supports_reprocess:
2727
2727
            raise errors.BzrCommandError("Conflict reduction is not supported"
2728
 
                                         " for merge type %s." % merge_type)
 
2728
                                         " for merge type %s." %
 
2729
                                         merger.merge_type)
2729
2730
        if merger.reprocess and merger.show_base:
2730
2731
            raise errors.BzrCommandError("Cannot do conflict reduction and"
2731
2732
                                         " show base.")