← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-08 12:28:05 UTC
  • mfrom: (5771 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5775.
  • Revision ID: john@arbash-meinel.com-20110408122805-qdo9uc2dtc9mzoic
Merge bzr 5771, make sure to have the latest create-file changes, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
65
65
from bzrlib.transport.http._urllib import HttpTransport_urllib
66
66
from bzrlib.transport.nosmart import NoSmartTransportDecorator
67
67
from bzrlib.transport.readonly import ReadonlyTransportDecorator
68
 
from bzrlib.repofmt import knitrepo, pack_repo
 
68
from bzrlib.repofmt import knitrepo, knitpack_repo
69
69
 
70
70
 
71
71
class TestDefaultFormat(TestCase):
501
501
    def test_default_stacking_with_stackable_branch_unstackable_repo(self):
502
502
        # Make stackable source branch with an unstackable repo format.
503
503
        source_bzrdir = self.make_bzrdir('source')
504
 
        pack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
 
504
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
505
505
        source_branch = bzrlib.branch.BzrBranchFormat7().initialize(
506
506
            source_bzrdir)
507
507
        # Make a directory with a default stacking policy