[MERGE] Fix #306879 by mentioning the base revision id in the 'BASE' conflict marker lines

[John Arbash Meinel]

John Arbash Meinel has voted comment.
Status is now: Semi-approved
Comment:
+
+    def test_show_base(self):
+        self.create_conflicts()
+        self.run_bzr(['merge', '../other'], retcode=1)
+        self.run_bzr(['remerge',  '--show-base', 'hello'], retcode=1)
+        tree = WorkingTree.open('.')
+        self.assertEqualDiff('<<<<<<< TREE\n'
+                             'Hello, world\n'
+                             '||||||| BASE-REVISION\n'
+                             'hi world\n'
+                             '=======\n'
+                             'Hello.\n'
+                             '>>>>>>> MERGE-SOURCE\n',
+                             tree.get_file_text(tree.path2id('hello')))
+    def test_show_base_show_ids(self):
+        self.create_conflicts()
+        self.run_bzr(['merge', '../other'], retcode=1)
+        self.run_bzr(['remerge',  '--show-base', '--show-ids', 
'hello'],
+                     retcode=1)
+        tree = WorkingTree.open('.')
+        self.assertEqualDiff('<<<<<<< TREE\n'
+                             'Hello, world\n'
+                             '||||||| BASE-REVISION 
(revid:base-revid)\n'
+                             'hi world\n'
+                             '=======\n'
+                             'Hello.\n'
+                             '>>>>>>> MERGE-SOURCE\n',
+                             tree.get_file_text(tree.path2id('hello')))


^- need a blank line between tests

Given the option, I wouldn't do this, but I don't see a real way around 
it.

I think, though, that if the flag is "--show-ids" then it would make 
sense to show all of the revision ids. For THIS and OTHER, and not just 
BASE.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Cm2ocz8b8xc.fsf_-_%40free.fr%3E
Project: Bazaar