← 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: Robert Collins
  • Date: 2010-06-17 06:30:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5301.
  • Revision ID: robertc@robertcollins.net-20100617063022-kb68pzdohhw9ezi8
Fixup tests in per_interbranch not being strict about making the from format the configured one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
145
145
        except (errors.IncompatibleFormat, errors.UninitializableFormat):
146
146
            # This Branch format cannot create shared repositories
147
147
            return
148
 
        # This is a little bit trickier because make_branch_and_tree will not
 
148
        # This is a little bit trickier because make_from_branch_and_tree will not
149
149
        # re-use a shared repository.
150
150
        try:
151
151
            a_branch = self.make_from_branch('repo/tree')