/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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-08-30 04:38:44 UTC
  • mfrom: (1908.6.14 use set_parent_trees.)
  • Revision ID: pqm@pqm.ubuntu.com-20060830043844-d570350402a5ad15
Use the new WorkingTree parent-management apis throughout the codebase.

Show diffs side-by-side

added added

removed removed

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