← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2007-08-30 08:11:54 UTC
  • mfrom: (2766 +trunk)
  • mto: (2535.3.55 repo-refactor)
  • mto: This revision was merged to the branch mainline in revision 2772.
  • Revision ID: andrew.bennetts@canonical.com-20070830081154-16hebp2xwr15x2hc
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
334
334
        self.write_directive('directive', source.branch, 'target', 'rev1',
335
335
                             mangle_patch=True)
336
336
        err = self.run_bzr('merge -d target directive')[1]
337
 
        self.expectFailure('Patch verification is disabled',
338
 
                           self.assertContainsRe, err,
339
 
                           'Preview patch does not match changes')
 
337
        self.assertContainsRe(err, 'Preview patch does not match changes')
340
338
 
341
339
    def test_merge_arbitrary(self):
342
340
        target = self.make_branch_and_tree('target')