Rev 4468: Merge bzr-1.16 back into trunk in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4468 [merge]
revision-id: john at arbash-meinel.com-20090622151345-vmwf3rs4903r1hmn
parent: pqm at pqm.ubuntu.com-20090622102620-6mdwon5k3pg1brgl
parent: pqm at pqm.ubuntu.com-20090618112922-6t54pt9kyuglz22m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2009-06-22 10:13:45 -0500
message:
  Merge bzr-1.16 back into trunk
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-06-21 04:30:25 +0000
+++ b/NEWS	2009-06-22 15:13:45 +0000
@@ -102,9 +102,11 @@
   this class and the UI.  (Martin Pool)
 
 
-bzr 1.16rc1 "It's yesterday in California" 2009-06-11
-#####################################################
+bzr 1.16 "It's yesterday in California" 2009-06-18
+##################################################
 :Codename: yesterday-in-california
+:1.16rc1: 2009-06-11
+:1.16: 2009-06-18
 
 This version of Bazaar contains the beta release of the new ``2a`` repository
 format, suitable for testing by fearless, advanced users. This format or an
@@ -116,6 +118,18 @@
 bug fixes and improvements.
 
 
+Changes from 1.16rc1 to 1.16final
+*********************************
+
+* Fix the nested tree flag check so that upgrade from development formats to
+  2a can work correctly.
+  (Jelmer Vernooij, #388727)
+
+* Automatic format upgrades triggered by default stacking policies on a
+  1.16rc1 (or later) smart server work again.
+  (Andrew Bennetts, #388675)
+
+
 Compatibility Breaks
 ********************
 

=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-06-18 19:19:49 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-06-22 15:13:45 +0000
@@ -1071,7 +1071,8 @@
         if not target_format.rich_root_data:
             raise errors.BadConversionTarget(
                 'Does not support rich root data.', target_format)
-        if not getattr(target_format, 'supports_tree_reference', False):
+        if (self.supports_tree_reference and 
+            not getattr(target_format, 'supports_tree_reference', False)):
             raise errors.BadConversionTarget(
                 'Does not support nested trees', target_format)