Rev 6083: (jelmer) Don't create branch references in control directories that do not in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6083 [merge]
revision-id: pqm at pqm.ubuntu.com-20110819154631-bwmy8w87dmd2y64v
parent: pqm at pqm.ubuntu.com-20110818042306-neji85pljf86z885
parent: jelmer at samba.org-20110818150651-7p4m2gke58kze15n
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-08-19 15:46:31 +0000
message:
  (jelmer) Don't create branch references in control directories that do not
   support custom branch formats. (Jelmer Vernooij)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-08-15 07:20:04 +0000
+++ b/bzrlib/branch.py	2011-08-18 15:06:51 +0000
@@ -2246,6 +2246,8 @@
             # creation contract must see it as uninitializable
             raise errors.UninitializableFormat(self)
         mutter('creating branch reference in %s', a_bzrdir.user_url)
+        if a_bzrdir._format.fixed_components:
+            raise errors.IncompatibleFormat(self, a_bzrdir._format)
         branch_transport = a_bzrdir.get_branch_transport(self, name=name)
         branch_transport.put_bytes('location',
             target_branch.bzrdir.user_url)