← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tag.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/test_tag.py
18
18
 
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
 
21
    controldir,
22
22
    errors,
23
23
    )
24
24
from bzrlib.tag import (
69
69
class TestTagMerging(TestCaseWithTransport):
70
70
 
71
71
    def make_knit_branch(self, relpath):
72
 
        old_bdf = bzrdir.format_registry.make_bzrdir('knit')
73
 
        return bzrdir.BzrDir.create_branch_convenience(relpath, format=old_bdf)
 
72
        old_bdf = controldir.format_registry.make_bzrdir('knit')
 
73
        return controldir.ControlDir.create_branch_convenience(relpath, format=old_bdf)
74
74
 
75
75
    def make_branch_supporting_tags(self, relpath):
76
76
        return self.make_branch(relpath, format='dirstate-tags')