Rev 2156: Fix thinko in _get_checkout_format; checkouts for RemoteBranches should be in the default bzrdir/repo format, of course. Thanks Robert. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

Andrew Bennetts andrew.bennetts at canonical.com
Mon Mar 5 08:07:00 GMT 2007


At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2156
revision-id: andrew.bennetts at canonical.com-20070305080113-hhmi12uzn1616n2u
parent: andrew.bennetts at canonical.com-20070305074829-5jw2mszjxine5340
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 19:01:13 +1100
message:
  Fix thinko in _get_checkout_format; checkouts for RemoteBranches should be in the default bzrdir/repo format, of course.  Thanks Robert.
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2007-03-05 07:33:49 +0000
+++ b/bzrlib/branch.py	2007-03-05 08:01:13 +0000
@@ -657,10 +657,12 @@
         Weaves are used if this branch's repository uses weaves.
         """
         from bzrlib.remote import RemoteBzrDir
-        if isinstance(self.bzrdir, (bzrdir.BzrDirPreSplitOut, RemoteBzrDir)):
+        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
             from bzrlib.repofmt import weaverepo
             format = bzrdir.BzrDirMetaFormat1()
             format.repository_format = weaverepo.RepositoryFormat7()
+        elif isinstance(self.bzrdir, RemoteBzrDir):
+            format = bzrdir.BzrDirMetaFormat1()
         else:
             format = self.repository.bzrdir.cloning_metadir()
             format.branch_format = self._format




More information about the bazaar-commits mailing list