← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
21
21
 
22
22
import bzrlib.branch
23
23
from bzrlib import (
24
 
    branch,
25
24
    bzrdir,
 
25
    controldir,
26
26
    errors,
27
27
    repository,
28
28
    revision as _mod_revision,
657
657
            raise TestNotApplicable('Only relevant for stackable formats.')
658
658
        # Initialize a bzrdir subject to the policy.
659
659
        t = self.get_transport('stacked')
660
 
        repo_fmt = bzrdir.format_registry.make_bzrdir('1.9')
 
660
        repo_fmt = controldir.format_registry.make_bzrdir('1.9')
661
661
        repo_name = repo_fmt.repository_format.network_name()
662
662
        repo, control = self.assertInitializeEx(
663
663
            t, need_meta=True, repo_format_name=repo_name, stacked_on=None)