/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/workingtree_implementations/test_workingtree.py

Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_workingtree.py
351
351
        wt.commit('A', rev_id='A')
352
352
        wt.rename_one('foo', 'bar')
353
353
        wt.commit('B', rev_id='B')
354
 
        wt.set_parent_trees(
355
 
            [('B', wt.branch.repository.revision_tree('B'))])
 
354
        wt.set_parent_ids(['B'])
356
355
        tree = wt.basis_tree()
357
356
        self.failUnless(tree.has_filename('bar'))
358
 
        wt.set_parent_trees(
359
 
            [('A', wt.branch.repository.revision_tree('A'))])
 
357
        wt.set_parent_ids(['A'])
360
358
        tree = wt.basis_tree()
361
359
        self.failUnless(tree.has_filename('foo'))
362
360