Rev 1584: Use 1.6-rich-root format by default. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1584
revision-id: jelmer at samba.org-20080821174618-a0i417d1lq6027a6
parent: jelmer at samba.org-20080821130119-xlduoxq7oa8297q8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-08-21 19:46:18 +0200
message:
  Use 1.6-rich-root format by default.
modified:
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
=== modified file 'FAQ'
--- a/FAQ	2008-08-05 18:21:19 +0000
+++ b/FAQ	2008-08-21 17:46:18 +0000
@@ -17,7 +17,7 @@
 
 ::
 
- $ bzr upgrade --rich-root-pack
+ $ bzr upgrade --1.6-rich-root
 
 Pushing a branch that didn't exist in Subversion yet with `bzr push` fails.
 ---------------------------------------------------------------------------

=== modified file 'NEWS'
--- a/NEWS	2008-08-21 13:01:19 +0000
+++ b/NEWS	2008-08-21 17:46:18 +0000
@@ -4,6 +4,8 @@
 
    * Fix setup.py run with python2.4. (#256804)
 
+   * Change default format to 1.6-rich-root.
+
 bzr-svn 0.4.11~rc1	2008-08-08
 
   CHANGES

=== modified file 'format.py'
--- a/format.py	2008-07-08 13:21:43 +0000
+++ b/format.py	2008-08-21 17:46:18 +0000
@@ -34,8 +34,8 @@
     if format.repository_format.rich_root_data:
         return format
     # Default format does not support rich root data, 
-    # fall back to rich-root-pack
-    format = format_registry.make_bzrdir('rich-root-pack')
+    # fall back to 1.6-rich-root
+    format = format_registry.make_bzrdir('1.6-rich-root')
     assert format.repository_format.rich_root_data
     return format
 

=== modified file 'remote.py'
--- a/remote.py	2008-08-04 16:23:24 +0000
+++ b/remote.py	2008-08-21 17:46:18 +0000
@@ -89,7 +89,7 @@
 
     def cloning_metadir(self):
         """Produce a metadir suitable for cloning with."""
-        return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
+        return bzrlib.bzrdir.format_registry.make_bzrdir("1.6-rich-root")
 
     def open_workingtree(self, _unsupported=False,
             recommend_upgrade=True):