~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_repository.py

MergeĀ knitpackrepo-5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
    workingtree,
38
38
    )
39
39
from bzrlib.repofmt import (
40
 
    pack_repo,
 
40
    knitpack_repo,
41
41
    )
42
42
from bzrlib.tests import (
43
43
    per_repository,
860
860
                "pre metadir branches do not upgrade on push "
861
861
                "with stacking policy")
862
862
        if isinstance(repo._format,
863
 
                      pack_repo.RepositoryFormatKnitPack5RichRootBroken):
 
863
                      knitpack_repo.RepositoryFormatKnitPack5RichRootBroken):
864
864
            raise tests.TestNotApplicable("unsupported format")
865
865
        # Make a source branch in 'repo' in an unstackable branch format
866
866
        bzrdir_format = self.repository_format._matchingbzrdir