← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
26
26
 
27
27
from bzrlib import (
28
28
    branch,
29
 
    builtins,
30
29
    bzrdir,
31
30
    check,
32
 
    debug,
33
31
    errors,
34
32
    push,
35
33
    repository,
40
38
from bzrlib.bzrdir import BzrDir
41
39
from bzrlib.memorytree import MemoryTree
42
40
from bzrlib.revision import NULL_REVISION
43
 
from bzrlib.smart import client, server
44
41
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
45
42
from bzrlib.tests.per_interbranch import (
46
43
    TestCaseWithInterBranch,
204
201
        default for the branch), and will be stacked when the repo format
205
202
        allows (which means that the branch format isn't necessarly preserved).
206
203
        """
207
 
        if isinstance(self.branch_format_from, branch.BzrBranchFormat4):
208
 
            raise tests.TestNotApplicable('Not a metadir format.')
209
204
        if isinstance(self.branch_format_from, branch.BranchReferenceFormat):
210
205
            # This test could in principle apply to BranchReferenceFormat, but
211
206
            # make_branch_builder doesn't support it.