Rev 1678: Fix compatibility with bzr 1.7. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1678
revision-id: jelmer at samba.org-20080829101059-7nq9t0ifwdz7cbtx
parent: jelmer at samba.org-20080829085504-2halcduygazwdl46
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-08-29 12:10:59 +0200
message:
  Fix compatibility with bzr 1.7.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
=== modified file 'NEWS'
--- a/NEWS	2008-08-28 15:59:55 +0000
+++ b/NEWS	2008-08-29 10:10:59 +0000
@@ -6,6 +6,8 @@
 
    * Fix contents of files when using stacked branching. (#262314)
 
+   * Fix compatibility with Bazaar 1.7.
+
 bzr-svn 0.4.11	2008-08-26
 
 bzr-svn 0.4.11~rc2	2008-08-26

=== modified file 'remote.py'
--- a/remote.py	2008-08-24 15:53:05 +0000
+++ b/remote.py	2008-08-29 10:10:59 +0000
@@ -85,9 +85,12 @@
             transport = transport.clone_root()
         return SvnRepository(self, transport, self.branch_path)
 
-    def cloning_metadir(self):
+    def cloning_metadir(self, stacked=False):
         """Produce a metadir suitable for cloning with."""
-        return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
+        if stacked:
+            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6-rich-root")
+        else:
+            return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
 
     def open_workingtree(self, _unsupported=False,
             recommend_upgrade=True):