/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Robert Collins
  • Date: 2007-08-22 00:00:26 UTC
  • mfrom: (2739 +trunk)
  • mto: (2592.3.96 repository)
  • mto: This revision was merged to the branch mainline in revision 2742.
  • Revision ID: robertc@robertcollins.net-20070822000026-kvufiqhlreokb1en
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
127
127
        # 'dir-20051005095101-da1441ea3fa6917a'
128
128
        self.assertNotEqual(
129
129
            [],
130
 
            repo.text_store.get_weave(
 
130
            repo.weave_store.get_weave(
131
131
                'dir-20051005095101-da1441ea3fa6917a',
132
132
                repo.get_transaction()))
133
133
 
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.