/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_bundle.py

Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
314
314
 
315
315
    def test_mismatched_bundle(self):
316
316
        format = bzrdir.BzrDirMetaFormat1()
317
 
        format.repository_format = knitrepo.RepositoryFormatKnit2()
 
317
        format.repository_format = knitrepo.RepositoryFormatKnit3()
318
318
        serializer = BundleSerializerV08('0.8')
319
319
        b = self.make_branch('.', format=format)
320
320
        self.assertRaises(errors.IncompatibleBundleFormat, serializer.write, 
323
323
    def test_matched_bundle(self):
324
324
        """Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
325
325
        format = bzrdir.BzrDirMetaFormat1()
326
 
        format.repository_format = knitrepo.RepositoryFormatKnit2()
 
326
        format.repository_format = knitrepo.RepositoryFormatKnit3()
327
327
        serializer = BundleSerializerV09('0.9')
328
328
        b = self.make_branch('.', format=format)
329
329
        serializer.write(b.repository, [], {}, StringIO())
331
331
    def test_mismatched_model(self):
332
332
        """Try copying a bundle from knit2 to knit1"""
333
333
        format = bzrdir.BzrDirMetaFormat1()
334
 
        format.repository_format = knitrepo.RepositoryFormatKnit2()
 
334
        format.repository_format = knitrepo.RepositoryFormatKnit3()
335
335
        source = self.make_branch_and_tree('source', format=format)
336
336
        source.commit('one', rev_id='one-id')
337
337
        source.commit('two', rev_id='two-id')
488
488
            tree.update()
489
489
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
490
490
            self.assertFalse(delta.has_changed(),
491
 
                             'Working tree has modifications')
 
491
                             'Working tree has modifications: %s' % delta)
492
492
        return tree
493
493
 
494
494
    def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
891
891
 
892
892
    def bzrdir_format(self):
893
893
        format = bzrdir.BzrDirMetaFormat1()
894
 
        format.repository_format = knitrepo.RepositoryFormatKnit2()
 
894
        format.repository_format = knitrepo.RepositoryFormatKnit3()
895
895
        return format
896
896
 
897
897