/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-08-15 01:11:27 UTC
  • mfrom: (2699 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2700.
  • Revision ID: aaron.bentley@utoronto.ca-20070815011127-0il5s8oqmt26bma7
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
72
72
        self.run_bzr('revert --no-backup')
73
73
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
74
74
        self.run_bzr('revert --no-backup')
 
75
        self.run_bzr_error(['Show-base is not supported for this merge type'],
 
76
                           'merge ../b -r last:1..last:1 --merge-type weave'
 
77
                           ' --show-base')
 
78
        self.run_bzr('revert --no-backup')
75
79
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
76
80
        self.run_bzr('revert --no-backup')
77
81
        self.run_bzr('merge ../b -r last:1')
330
334
        self.write_directive('directive', source.branch, 'target', 'rev1',
331
335
                             mangle_patch=True)
332
336
        err = self.run_bzr('merge -d target directive')[1]
333
 
        self.assertContainsRe(err, 'Preview patch does not match changes')
 
337
        self.expectFailure('Patch verification is disabled',
 
338
                           self.assertContainsRe, err,
 
339
                           'Preview patch does not match changes')
334
340
 
335
341
    def test_merge_arbitrary(self):
336
342
        target = self.make_branch_and_tree('target')