← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Martin Pool
  • Date: 2006-03-06 11:20:10 UTC
  • mfrom: (1593 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1611.
  • Revision ID: mbp@sourcefrog.net-20060306112010-17c0170dde5d1eea
[merge] large merge to sync with bzr.dev

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
39
38
    def test_pending_with_null(self):
40
39
        """When base is forced to revno 0, pending_merges is set"""
41
40
        wt2 = self.test_unrelated()
42
 
        wt1 = WorkingTree('.')
 
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],