/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 bzrlib/tests/per_interbranch/test_push.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-17 09:23:19 UTC
  • mfrom: (5301 +trunk)
  • mto: (5247.1.8 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100617092319-da2bzdtf3j0voynf
Merge bzr.dev into cleanup

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')