/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-13 01:54:49 UTC
  • mfrom: (2817 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2826.
  • Revision ID: aaron.bentley@utoronto.ca-20070913015449-bjjw2njf3in5roq7
Merge bzr.dev

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)
228
228
        tree_a.commit('changed file to directory')
229
229
        tree_b.merge_from_branch(tree_a.branch)
230
230
        self.assertEqual('directory', file_kind('tree_b/file'))
231
 
        tree_b.revert([])
 
231
        tree_b.revert()
232
232
        self.assertEqual('file', file_kind('tree_b/file'))
233
233
        self.build_tree_contents([('tree_b/file', 'content_2')])
234
234
        tree_b.commit('content change')