/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interbranch/test_push.py
23
23
 
24
24
from ... import (
25
25
    branch,
 
26
    bzrbranch,
26
27
    check,
27
28
    controldir,
28
29
    errors,
198
199
        default for the branch), and will be stacked when the repo format
199
200
        allows (which means that the branch format isn't necessarly preserved).
200
201
        """
201
 
        if isinstance(self.branch_format_from, branch.BranchReferenceFormat):
 
202
        if isinstance(self.branch_format_from, bzrbranch.BranchReferenceFormat):
202
203
            # This test could in principle apply to BranchReferenceFormat, but
203
204
            # make_branch_builder doesn't support it.
204
205
            raise tests.TestSkipped(
239
240
        # Make a local branch with four revisions.  Four revisions because:
240
241
        # one to push, one there for _walk_to_common_revisions to find, one we
241
242
        # don't want to access, one for luck :)
242
 
        if isinstance(self.branch_format_from, branch.BranchReferenceFormat):
 
243
        if isinstance(self.branch_format_from, bzrbranch.BranchReferenceFormat):
243
244
            # This test could in principle apply to BranchReferenceFormat, but
244
245
            # make_branch_builder doesn't support it.
245
246
            raise tests.TestSkipped(