/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/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-09-05 03:51:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2797.
  • Revision ID: aaron.bentley@utoronto.ca-20070905035123-b94n6tg3ht0kt7zp
update new test case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
142
142
                    this_tree=tree_b, ignore_zero=True)
143
143
        log = self._get_log(keep_log_file=True)
144
144
        self.failUnless('All changes applied successfully.\n' not in log)
145
 
        tree_b.revert([])
 
145
        tree_b.revert()
146
146
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
147
147
                    this_tree=tree_b, ignore_zero=False)
148
148
        log = self._get_log(keep_log_file=True)