/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-12-09 20:58:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209205803-9puidarg2y33bpzj
Get cherrypick-on-weave working

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
417
417
        other_tree.commit('rev2b')
418
418
        self.build_tree_contents([('other/file', "c\na\nb\n")])
419
419
        other_tree.commit('rev3b')
420
 
        self.run_bzr('merge --weave -d this other -c -1')
 
420
        self.run_bzr('merge --weave -d this other -r -2..-1')
421
421
        self.assertFileEqual('c\na\n', 'this/file')