Rev 3621: Name the new format 1.6.1-rich-root, and NEWS for fixing bug #262333 in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/rich_root_serializer

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/rich_root_serializer

------------------------------------------------------------
revno: 3621
revision-id: john at arbash-meinel.com-20080829024439-zx2jhwqbt4qlyg13
parent: john at arbash-meinel.com-20080829023918-10cy13i3x5af62ne
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rich_root_serializer
timestamp: Thu 2008-08-28 21:44:39 -0500
message:
  Name the new format 1.6.1-rich-root, and NEWS for fixing bug #262333
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-08-25 14:06:14 +0000
+++ b/NEWS	2008-08-29 02:44:39 +0000
@@ -4,6 +4,19 @@
 
 .. contents::
 
+bzr 1.6.1 IN DEVELOPMENT
+------------------------
+
+  BUG FIXES:
+
+    * The previous ``--1.6-rich-root`` format used an incorrect xml
+      serializer, which would accidentally support fetching from a
+      repository that supported subtrees, even though the local one would
+      not. We deprecated that format, and introduced a new one that uses
+      the correct serializer ``--1.6.1-rich-root``.
+      (John Arbash Meinel, #262333)
+
+
 bzr 1.6 2008-08-25
 ------------------
 

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2008-08-29 02:39:18 +0000
+++ b/bzrlib/bzrdir.py	2008-08-29 02:44:39 +0000
@@ -3026,16 +3026,16 @@
     branch_format='bzrlib.branch.BzrBranchFormat7',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
     )
-format_registry.register_metadir('1.6-rich-root',
+format_registry.register_metadir('1.6.1-rich-root',
     'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
     help='A branch and pack based repository that supports stacking '
          'and rich root data (needed for bzr-svn). ',
     branch_format='bzrlib.branch.BzrBranchFormat7',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
     )
-format_registry.register_metadir('1.6-old-rich-root',
+format_registry.register_metadir('1.6-rich-root',
     'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRootBroken',
-    help='(deprecated, use --1.6-rich-root instead) A branch and pack based'
+    help='(deprecated, use --1.6.1-rich-root instead) A branch and pack based'
          ' repository that supports stacking and rich root data (needed for'
          ' bzr-svn).',
     branch_format='bzrlib.branch.BzrBranchFormat7',

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-08-29 02:39:18 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-08-29 02:44:39 +0000
@@ -2104,7 +2104,7 @@
 
     def _get_matching_bzrdir(self):
         return bzrdir.format_registry.make_bzrdir(
-            '1.6-rich-root')
+            '1.6.1-rich-root')
 
     def _ignore_setting_bzrdir(self, format):
         pass