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

Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
921
921
        base_rev = common_ancestor(branch_from.last_revision(),
922
922
                                   wt_to.branch.last_revision(),
923
923
                                   wt_to.branch.repository)
924
 
        merge_inner(wt_to.branch, branch_from.basis_tree(), 
 
924
        merge_inner(wt_to.branch, branch_from.basis_tree(),
925
925
                    wt_to.branch.repository.revision_tree(base_rev),
926
926
                    this_tree=wt_to)
927
 
        wt_to.add_pending_merge(branch_from.last_revision())
 
927
        wt_to.add_parent_tree_id(branch_from.last_revision())
928
928
 
929
929
 
930
930
BzrTestBase = TestCase