← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_pull.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_interbranch/test_pull.py
17
17
"""Tests for InterBranch.pull behaviour."""
18
18
 
19
19
from bzrlib.branch import Branch
20
 
from bzrlib.bzrdir import BzrDir
 
20
from bzrlib.controldir import ControlDir
21
21
from bzrlib import errors
22
22
from bzrlib.memorytree import MemoryTree
23
23
from bzrlib.revision import NULL_REVISION
175
175
            # remotebranches can't be bound.  Let's instead make a new local
176
176
            # branch of the default type, which does allow binding.
177
177
            # See https://bugs.launchpad.net/bzr/+bug/112020
178
 
            local = BzrDir.create_branch_convenience('local2')
 
178
            local = ControlDir.create_branch_convenience('local2')
179
179
            local.bind(target)
180
180
        source = self.make_from_branch('source')
181
181
        Branch.hooks.install_named_hook('post_pull',