← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_push.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
22
22
from bzrlib import (
23
23
    branch,
24
24
    builtins,
25
 
    bzrdir,
 
25
    controldir,
26
26
    check,
27
27
    errors,
28
28
    memorytree,
173
173
            if self.vfs_transport_factory is test_server.LocalURLServer:
174
174
                # the branch is colocated on disk, we cannot create a checkout.
175
175
                # hopefully callers will expect this.
176
 
                local_controldir= bzrdir.BzrDir.open(
 
176
                local_controldir = controldir.ControlDir.open(
177
177
                    self.get_vfs_only_url('repo/tree'))
178
178
                tree = local_controldir.create_workingtree()
179
179
            else:
355
355
            # remotebranches can't be bound.  Let's instead make a new local
356
356
            # branch of the default type, which does allow binding.
357
357
            # See https://bugs.launchpad.net/bzr/+bug/112020
358
 
            local = bzrdir.BzrDir.create_branch_convenience('local2')
 
358
            local = controldir.ControlDir.create_branch_convenience('local2')
359
359
            local.bind(target)
360
360
        source = self.make_branch('source')
361
361
        branch.Branch.hooks.install_named_hook(