← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge from Robert [Fails tests]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
39
39
    def test_pending_with_null(self):
40
40
        """When base is forced to revno 0, pending_merges is set"""
41
41
        wt2 = self.test_unrelated()
42
 
        wt1 = WorkingTree('.')
 
42
        wt1 = WorkingTree.open('.')
43
43
        br1 = wt1.branch
44
44
        fetch(from_branch=wt2.branch, to_branch=br1)
45
45
        # merge all of branch 2 into branch 1 even though they