← 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 04:20:19 UTC
  • mfrom: (3062.2.13 fast-plan-merge2)
  • Revision ID: pqm@pqm.ubuntu.com-20071220042019-wsij5vgvhgw4qhdt
Annotate merge can do cherrypicks (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
407
407
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
408
408
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
409
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')