/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_core.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/test_merge_core.py
53
53
        for tt, wt in ((self.this_tt, self.this), (self.other_tt, self.other)):
54
54
            # why does this not do wt.pull() ?
55
55
            wt.branch.pull(self.base.branch)
56
 
            wt.set_parent_trees([(wt.branch.last_revision(),
57
 
                wt.branch.repository.revision_tree(wt.branch.last_revision()))])
 
56
            wt.set_parent_ids([wt.branch.last_revision()])
58
57
            tt.apply()
59
58
            wt.commit('branch commit')
60
59
            assert len(wt.branch.revision_history()) == 2