← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_pull.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-05-08 20:32:56 UTC
  • mfrom: (2483.1.2 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
(John Arbash Meinel) Merge fixes from 0.16 into bzr.dev and update for 0.17 development

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_pull.py
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib.branch import Branch
 
21
from bzrlib.branch import Branch, BzrBranchFormat5
 
22
from bzrlib.bzrdir import BzrDir
22
23
from bzrlib import errors
23
24
from bzrlib.memorytree import MemoryTree
24
25
from bzrlib.revision import NULL_REVISION
 
26
from bzrlib.tests import TestSkipped
25
27
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
26
28
 
27
29
 
142
144
        try:
143
145
            local.bind(target)
144
146
        except errors.UpgradeRequired:
145
 
            # cant bind this format, the test is irrelevant.
146
 
            return
 
147
            # We can't bind this format to itself- typically it is the local
 
148
            # branch that doesn't support binding.  As of May 2007
 
149
            # remotebranches can't be bound.  Let's instead make a new local
 
150
            # branch of the default type, which does allow binding.
 
151
            # See https://bugs.launchpad.net/bzr/+bug/112020
 
152
            local = BzrDir.create_branch_convenience('local2')
 
153
            local.bind(target)
147
154
        source = self.make_branch('source')
148
155
        Branch.hooks.install_hook('post_pull', self.capture_post_pull_hook)
149
156
        local.pull(source)