← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remerge.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-10 23:11:35 UTC
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210231135-1w7w19m19u3j386c
.BASE is also dropped by remerge (expected, just didn't find the test).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
85
85
                           'remerge --merge-type weave', retcode=1)
86
86
 
87
87
        self.failUnlessExists('hello.OTHER')
88
 
        self.failIfExists('hello.BASE')
 
88
        self.failUnless('hello.BASE')
89
89
        self.assertFalse('|||||||' in conflict_text)
90
90
        self.assertFalse('hi world' in conflict_text)
91
91