Rev 6476: (jelmer) Allow control directories to provide colocated branch support but in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6476 [merge]
revision-id: pqm at pqm.ubuntu.com-20120220120245-bvo53gwgx3n9lmw0
parent: pqm at pqm.ubuntu.com-20120216180157-yegt0ppjq6tvfu7w
parent: jelmer at samba.org-20120219143422-v1h6ytfw995pax0w
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-02-20 12:02:45 +0000
message:
  (jelmer) Allow control directories to provide colocated branch support but
   not branch references. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_controldir_colo/test_supported.py test_supported.py-20100411192232-kawv9qu1t42gv89k-3
=== modified file 'bzrlib/tests/per_controldir_colo/test_supported.py'
--- a/bzrlib/tests/per_controldir_colo/test_supported.py	2012-01-23 19:09:00 +0000
+++ b/bzrlib/tests/per_controldir_colo/test_supported.py	2012-02-19 14:34:22 +0000
@@ -145,6 +145,10 @@
     def test_branch_reference(self):
         referenced = self.make_branch('referenced')
         repo = self.make_repository('repo')
-        repo.bzrdir.set_branch_reference(referenced, name='foo')
+        try:
+            repo.bzrdir.set_branch_reference(referenced, name='foo')
+        except errors.IncompatibleFormat:
+            raise tests.TestNotApplicable(
+                'Control dir does not support creating branch references.')
         self.assertEquals(referenced.base,
             repo.bzrdir.get_branch_reference('foo'))