← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.py

  • Committer: jelmer at samba
  • Date: 2011-10-11 12:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111011120151-l1aa35zasaocrev3
Fix tests and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
22
22
from bzrlib import (
23
23
    branch,
24
24
    bzrdir,
 
25
    controldir,
25
26
    errors,
26
27
    revision as _mod_revision,
27
28
    )
159
160
 
160
161
        def make_shared_tree(path):
161
162
            shared_repo.bzrdir.root_transport.mkdir(path)
162
 
            shared_repo.bzrdir.create_branch_convenience('repo/' + path)
 
163
            controldir.ControlDir.create_branch_convenience('repo/' + path)
163
164
            return WorkingTree.open('repo/' + path)
164
165
        tree_a = make_shared_tree('a')
165
166
        self.build_tree(['repo/a/file'])