Rev 4618: Fix a broken check in per_bzr tests that causes failures when the default format is rich roots. in http://bazaar.launchpad.net/~lifeless/bzr/per_bzrdir

Robert Collins robertc at robertcollins.net
Mon Aug 17 08:46:06 BST 2009


At http://bazaar.launchpad.net/~lifeless/bzr/per_bzrdir

------------------------------------------------------------
revno: 4618
revision-id: robertc at robertcollins.net-20090817074603-l9gnd40bg6xp38t0
parent: pqm at pqm.ubuntu.com-20090817003227-g813yyjlq47j9qyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per_bzrdir
timestamp: Mon 2009-08-17 17:46:03 +1000
message:
  Fix a broken check in per_bzr tests that causes failures when the default format is rich roots.
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-08-14 13:55:30 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-08-17 07:46:03 +0000
@@ -1258,7 +1258,7 @@
         # repository is the same as the external location of the stacked-on
         # branch.
         balloon = self.make_bzrdir('balloon')
-        if isinstance(balloon, bzrdir.BzrDirMetaFormat1):
+        if isinstance(balloon._format, bzrdir.BzrDirMetaFormat1):
             stack_on = self.make_branch('stack-on', format='1.9')
         else:
             stack_on = self.make_branch('stack-on')




More information about the bazaar-commits mailing list