← Back to branch summary

~toddy/bzr/bzr.i18n

« back to all changes in this revision

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

  • Committer: Tobias Toedter
  • Date: 2007-12-30 18:52:13 UTC
  • mfrom: (2438.1.708 +trunk)
  • Revision ID: t.toedter@gmx.net-20071230185213-7xiqpbtshmnsf073
Merge trunk

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):
406
407
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
407
408
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
408
409
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
 
410
 
 
411
    def test_weave_cherrypick(self):
 
412
        this_tree = self.make_branch_and_tree('this')
 
413
        self.build_tree_contents([('this/file', "a\n")])
 
414
        this_tree.add('file')
 
415
        this_tree.commit('rev1')
 
416
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
417
        self.build_tree_contents([('other/file', "a\nb\n")])
 
418
        other_tree.commit('rev2b')
 
419
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
420
        other_tree.commit('rev3b')
 
421
        self.run_bzr('merge --weave -d this other -r -2..-1')
 
422
        self.assertFileEqual('c\na\n', 'this/file')