/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: 2008-01-03 06:38:53 UTC
  • mto: (3144.5.2 specific-file)
  • mto: This revision was merged to the branch mainline in revision 3156.
  • Revision ID: aaron.bentley@utoronto.ca-20080103063853-7sv9zq8m87p7gzf7
Update from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
435
435
        self.build_tree_contents([('b/file',
436
436
                                   'base-contents\nother-contents\n')])
437
437
        tree_b.commit('', rev_id='rev2b')
438
 
        self.build_tree_contents([('a/file',
439
 
                                   'base-contents\nthis-contents\n')])
440
438
        tree_a.merge_from_branch(tree_b.branch)
441
439
        self.build_tree_contents([('a/file',
442
440
                                   'base-contents\nthis-contents\n')])