← 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: Canonical.com Patch Queue Manager
  • Date: 2007-12-20 03:27:35 UTC
  • mfrom: (1551.19.23 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20071220032735-fldmkfcg632g4uez
Warn when merge directives cause cherrypicks (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
301
301
        target.commit('empty commit')
302
302
        self.write_directive('directive', source.branch, 'target', 'rev2',
303
303
                             'rev1')
304
 
        self.run_bzr('merge -d target directive')
 
304
        out, err = self.run_bzr('merge -d target directive')
305
305
        self.failIfExists('target/a')
306
306
        self.failUnlessExists('target/b')
 
307
        self.assertContainsRe(err, 'Performing cherrypick')
307
308
 
308
309
    def write_directive(self, filename, source, target, revision_id,
309
310
                        base_revision_id=None, mangle_patch=False):