← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Fix status to not use pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
77
77
        self.failIfExists('bar')
78
78
        wt2 = WorkingTree.open_containing('branch2')[0]
79
79
        self.assertEqual(wt2.pending_merges(), [])
80
 
 
 
80
        
81
81
    def test_pending_with_null(self):
82
82
        """When base is forced to revno 0, pending_merges is set"""
83
83
        wt2 = self.test_unrelated()