Rev 5076: (Jelmer) Document that BzrDirFormat.colocated_branches is a cvar. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5076 [merge]
revision-id: pqm at pqm.ubuntu.com-20100306000511-w0z9eaes61s10syk
parent: pqm at pqm.ubuntu.com-20100305092703-xwm9tmj33i3ym5rp
parent: jelmer at samba.org-20100305231703-75wrv82veokxdoe9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2010-03-06 00:05:11 +0000
message:
  (Jelmer) Document that BzrDirFormat.colocated_branches is a cvar.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2010-03-02 19:50:18 +0000
+++ b/bzrlib/bzrdir.py	2010-03-05 23:17:03 +0000
@@ -1816,6 +1816,8 @@
     Once a format is deprecated, just deprecate the initialize and open
     methods on the format class. Do not deprecate the object, as the
     object will be created every system load.
+
+    :cvar colocated_branches: Whether this formats supports colocated branches.
     """
 
     _default_format = None