← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-18 14:49:52 UTC
  • mfrom: (4624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090818144952-mk2cy45ax9twl3lm
Merge bzr.dev 4624 in preparation for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
1258
1258
        # repository is the same as the external location of the stacked-on
1259
1259
        # branch.
1260
1260
        balloon = self.make_bzrdir('balloon')
1261
 
        if isinstance(balloon, bzrdir.BzrDirMetaFormat1):
 
1261
        if isinstance(balloon._format, bzrdir.BzrDirMetaFormat1):
1262
1262
            stack_on = self.make_branch('stack-on', format='1.9')
1263
1263
        else:
1264
1264
            stack_on = self.make_branch('stack-on')