← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-26 15:31:02 UTC
  • mto: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: jelmer@samba.org-20120126153102-mzbhq2vtov09f1nf
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
319
319
        except errors.IncompatibleFormat:
320
320
            return
321
321
        self.assertEquals(0, len(repo.bzrdir.list_branches()))
 
322
        if not self.bzrdir_format.colocated_branches:
 
323
            raise tests.TestNotApplicable("control dir format does not support "
 
324
                "colocated branches")
322
325
        try:
323
326
            child_branch1 = self.branch_format.initialize(repo.bzrdir, 
324
327
                name='branch1')