← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-30 08:11:54 UTC
  • mfrom: (2766 +trunk)
  • mto: (2535.3.55 repo-refactor)
  • mto: This revision was merged to the branch mainline in revision 2772.
  • Revision ID: andrew.bennetts@canonical.com-20070830081154-16hebp2xwr15x2hc
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
195
195
        converter.convert(tree.bzrdir, progress.DummyProgress())
196
196
        new_tree = workingtree.WorkingTree.open('tree')
197
197
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
198
 
        self.assertEqual(None, new_tree.last_revision())
 
198
        self.assertEqual('null:', new_tree.last_revision())
199
199
 
200
200
    def test_convert_knit_dirstate_content(self):
201
201
        # smoke test for dirstate conversion: we call dirstate primitives,
208
208
        converter.convert(tree.bzrdir, progress.DummyProgress())
209
209
        new_tree = workingtree.WorkingTree.open('tree')
210
210
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
211
 
        self.assertEqual(None, new_tree.last_revision())
 
211
        self.assertEqual('null:', new_tree.last_revision())
212
212
 
213
213
    def test_convert_knit_one_parent_dirstate(self):
214
214
        # test that asking for an upgrade from knit to dirstate works.