← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
4
4
from bzrlib.builtins import merge
5
5
from bzrlib.commit import commit
6
6
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
7
 
from bzrlib.fetch import fetch
8
7
from bzrlib.merge import transform_tree
9
8
from bzrlib.osutils import pathjoin
10
9
from bzrlib.revision import common_ancestor
41
40
        wt2 = self.test_unrelated()
42
41
        wt1 = WorkingTree.open('.')
43
42
        br1 = wt1.branch
44
 
        fetch(from_branch=wt2.branch, to_branch=br1)
 
43
        br1.fetch(wt2.branch)
45
44
        # merge all of branch 2 into branch 1 even though they 
46
45
        # are not related.
47
46
        self.assertRaises(BzrCommandError, merge, ['branch2', -1],