← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
131
131
        self.build_tree_contents(_upgrade_dir_template)
132
132
        upgrade('.', bzrdir.BzrDirMetaFormat1())
133
133
        tree = workingtree.WorkingTree.open('.')
134
 
        self.assertEqual(tree.last_revision(),
135
 
                         tree.branch.revision_history()[-1])
 
134
        self.assertEqual([tree.branch.revision_history()[-1]],
 
135
            tree.get_parent_ids())
136
136
 
137
137
    def test_upgrade_v6_to_meta_no_workingtree(self):
138
138
        # Some format6 branches do not have checkout files. Upgrading