Bazaar

Merge lp:~lifeless/bzr/per_bzrdir into lp:~bzr/bzr/trunk-old

  1. per_bzrdir
  2. Merge into trunk-old
Proposed by Robert Collins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lifeless/bzr/per_bzrdir
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 12 lines
To merge this branch: bzr merge lp:~lifeless/bzr/per_bzrdir
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+10235@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

[MERGE] Fix a broken check in per_bzr tests that causes failures when
the default format is rich roots.

--

Revision history for this message
Vincent Ladeuil (vila) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
2--- bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-08-14 13:55:30 +0000
3+++ bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-08-17 20:35:36 +0000
4@@ -1258,7 +1258,7 @@
5 # repository is the same as the external location of the stacked-on
6 # branch.
7 balloon = self.make_bzrdir('balloon')
8- if isinstance(balloon, bzrdir.BzrDirMetaFormat1):
9+ if isinstance(balloon._format, bzrdir.BzrDirMetaFormat1):
10 stack_on = self.make_branch('stack-on', format='1.9')
11 else:
12 stack_on = self.make_branch('stack-on')