/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 breezy/tests/test_upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upgrade.py
90
90
        # and its there that the core logic is tested.
91
91
        tree = self.make_branch_and_tree('tree', format='knit')
92
92
        self.build_tree(['tree/file'])
93
 
        tree.add(['file'], [b'file-id'])
 
93
        tree.add(['file'], ['file-id'])
94
94
        target = controldir.format_registry.make_controldir('dirstate')
95
95
        converter = tree.controldir._format.get_converter(target)
96
96
        converter.convert(tree.controldir, None)
97
97
        new_tree = workingtree.WorkingTree.open('tree')
98
98
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
99
 
        self.assertEqual(b'null:', new_tree.last_revision())
 
99
        self.assertEqual('null:', new_tree.last_revision())
100
100
 
101
101
    def test_convert_knit_one_parent_dirstate(self):
102
102
        # test that asking for an upgrade from knit to dirstate works.