Rev 3909: Fix #306879 by mentioning the base revision id in the 'BASE' conflict marker lines. in lp:~vila/bzr/306879-show-base-revid

[Vincent Ladeuil]

At lp:~vila/bzr/306879-show-base-revid

------------------------------------------------------------
revno: 3909
revision-id: v.ladeuil+lp at free.fr-20081216162615-flta6emkfkpet1tt
parent: pqm at pqm.ubuntu.com-20081216050844-csmbt4az61zghcxf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 306879-show-base-revid
timestamp: Tue 2008-12-16 17:26:15 +0100
message:
  Fix #306879 by mentioning the base revision id in the 'BASE' conflict marker lines.
  
  * bzrlib/tests/blackbox/test_merge.py:
  (TestMerge.test_merge_override_show_base): Update test.
  
  * bzrlib/merge.py:
  (Merge3Merger.text_merge.iter_merge3): Add the revid when
  show-base is used.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-12-11 03:18:52 +0000
+++ b/bzrlib/merge.py	2008-12-16 16:26:15 +0000
@@ -1194,10 +1194,15 @@
 
         def iter_merge3(retval):
             retval["text_conflicts"] = False
-            for line in m3.merge_lines(name_a = "TREE", 
-                                       name_b = "MERGE-SOURCE", 
-                                       name_base = "BASE-REVISION",
-                                       start_marker=start_marker, 
+
+            get_base_revid = getattr(self.base_tree, 'get_revision_id', None)
+            if get_base_revid is None:
+                get_base_revid = self.base_tree.last_revision
+            name_base = 'BASE-REVISION (revid:%s)' % get_base_revid()
+            for line in m3.merge_lines(name_a="TREE",
+                                       name_b="MERGE-SOURCE",
+                                       name_base=name_base,
+                                       start_marker=start_marker,
                                        base_marker=base_marker,
                                        reprocess=self.reprocess):
                 if line.startswith(start_marker):

=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2008-10-02 16:56:01 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2008-12-16 16:26:15 +0000
@@ -165,7 +165,7 @@
                              '<<<<<<< TREE\n'
                              'B\n'
                              'C\n'
-                             '||||||| BASE-REVISION\n'
+                             '||||||| BASE-REVISION (revid:rev1)\n'
                              'b\n'
                              'c\n'
                              '=======\n'