Rev 2673: (robertc) Merge Michael Hudson's merge --weave --show-base error output fix. (Michael Hudson) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2673
revision-id: pqm at pqm.ubuntu.com-20070806040104-af06p8gf7bsb3eze
parent: pqm at pqm.ubuntu.com-20070806023139-97nrt9mu4qihcdf3
parent: michael.hudson at canonical.com-20070801083824-k2wh3mt9uy1walu9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-08-06 05:01:04 +0100
message:
  (robertc) Merge Michael Hudson's merge --weave --show-base error output fix. (Michael Hudson)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
    ------------------------------------------------------------
    revno: 2665.2.1
    merged: michael.hudson at canonical.com-20070801083824-k2wh3mt9uy1walu9
    parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: nameerror-in-merge
    timestamp: Wed 2007-08-01 09:38:24 +0100
    message:
      test and fix for a NameError in merge --weave --show-base
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-07-31 20:02:47 +0000
+++ b/bzrlib/builtins.py	2007-08-01 08:38:24 +0000
@@ -2722,10 +2722,11 @@
         if (merger.show_base and
             not merger.merge_type is _mod_merge.Merge3Merger):
             raise errors.BzrCommandError("Show-base is not supported for this"
-                                         " merge type. %s" % merge_type)
+                                         " merge type. %s" % merger.merge_type)
         if merger.reprocess and not merger.merge_type.supports_reprocess:
             raise errors.BzrCommandError("Conflict reduction is not supported"
-                                         " for merge type %s." % merge_type)
+                                         " for merge type %s." %
+                                         merger.merge_type)
         if merger.reprocess and merger.show_base:
             raise errors.BzrCommandError("Cannot do conflict reduction and"
                                          " show base.")

=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2007-07-31 11:20:50 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2007-08-01 08:38:24 +0000
@@ -72,6 +72,10 @@
         self.run_bzr('revert --no-backup')
         self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
         self.run_bzr('revert --no-backup')
+        self.run_bzr_error(['Show-base is not supported for this merge type'],
+                           'merge ../b -r last:1..last:1 --merge-type weave'
+                           ' --show-base')
+        self.run_bzr('revert --no-backup')
         self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
         self.run_bzr('revert --no-backup')
         self.run_bzr('merge ../b -r last:1')