/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_branch/test_sprout.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-19 18:40:15 UTC
  • mfrom: (5622 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5624.
  • Revision ID: jelmer@samba.org-20110119184015-ahycpz0yduideif0
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_sprout.py
182
182
                source.last_revision(), possible_transports=[target_transport],
183
183
                source_branch=source, stacked=True)
184
184
        except errors.UnstackableBranchFormat:
185
 
            if isinstance(self.branch_format, _mod_branch.BzrBranchFormat4):
186
 
                raise tests.KnownFailure(
187
 
                    "Format 4 doesn't auto stack successfully.")
 
185
            if not self.branch_format.supports_stacking():
 
186
                raise tests.TestNotApplicable(
 
187
                    "Format doesn't auto stack successfully.")
188
188
            else:
189
189
                raise
190
190
        result = dir.open_branch()