~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_parents.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
                             _mod_revision.ensure_null(tree.last_revision()))
52
52
        else:
53
53
            self.assertEqual(expected[0], tree.last_revision())
54
 
        self.assertEqual(expected[1:],
55
 
            self.applyDeprecated(symbol_versioning.zero_eleven,
56
 
                tree.pending_merges))
57
54
 
58
55
 
59
56
class TestGetParents(TestParents):