Rev 4718: Add bug #494197 as the source of the KnownFailure test. in http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

------------------------------------------------------------
revno: 4718
revision-id: john at arbash-meinel.com-20091208210407-6aru9orglbflla2n
parent: john at arbash-meinel.com-20091208205509-w96riinzbqwrc407
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-40412-show-base-weave
timestamp: Tue 2009-12-08 15:04:07 -0600
message:
  Add bug #494197 as the source of the KnownFailure test.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py	2009-12-08 20:55:09 +0000
+++ b/bzrlib/tests/test_merge_core.py	2009-12-08 21:04:07 +0000
@@ -434,6 +434,7 @@
         self.assertEqual('text2', builder.this.get_file('1').read())
         builder.cleanup()
 
+
 class FunctionalMergeTest(TestCaseWithTransport):
 
     def test_trivial_star_merge(self):
@@ -492,6 +493,7 @@
     def test_weave_conflicts_not_in_base(self):
         builder = self.make_branch_builder('source')
         builder.start_series()
+        # See bug #494197
         #  A        base revision (before criss-cross)
         #  |\
         #  B C      B does nothing, C adds 'foo'