Rev 4721: .BASE is also dropped by remerge (expected, just didn't find the test). in http://bazaar.launchpad.net/~jameinel/bzr/2.1-40412-show-base-weave

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 4721
revision-id: john at arbash-meinel.com-20091210231135-1w7w19m19u3j386c
parent: john at arbash-meinel.com-20091210214920-oiwetcplojnswhn3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-40412-show-base-weave
timestamp: Thu 2009-12-10 17:11:35 -0600
message:
  .BASE is also dropped by remerge (expected, just didn't find the test).
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_remerge.py'
--- a/bzrlib/tests/blackbox/test_remerge.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_remerge.py	2009-12-10 23:11:35 +0000
@@ -85,7 +85,7 @@
                            'remerge --merge-type weave', retcode=1)
 
         self.failUnlessExists('hello.OTHER')
-        self.failIfExists('hello.BASE')
+        self.failUnless('hello.BASE')
         self.assertFalse('|||||||' in conflict_text)
         self.assertFalse('hi world' in conflict_text)