Rev 4468: (jam) Merge bzr-1.16 back into bzr.dev trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jun 22 17:14:25 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4468
revision-id: pqm at pqm.ubuntu.com-20090622161421-cjjkok3a60d6uqho
parent: pqm at pqm.ubuntu.com-20090622102620-6mdwon5k3pg1brgl
parent: john at arbash-meinel.com-20090622151345-vmwf3rs4903r1hmn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-06-22 17:14:21 +0100
message:
(jam) Merge bzr-1.16 back into bzr.dev trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4467.1.1
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
------------------------------------------------------------
revno: 4431.3.6
revision-id: pqm at pqm.ubuntu.com-20090618112922-6t54pt9kyuglz22m
parent: pqm at pqm.ubuntu.com-20090618101956-9njw6b6me6anb787
parent: jml at canonical.com-20090618102900-9i2evmacjneht0rm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-18 12:29:22 +0100
message:
(jml) Prepare 1.16.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4431.6.1
revision-id: jml at canonical.com-20090618102900-9i2evmacjneht0rm
parent: pqm at pqm.ubuntu.com-20090618101956-9njw6b6me6anb787
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Thu 2009-06-18 20:29:00 +1000
message:
Release 1.16.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4431.3.5
revision-id: pqm at pqm.ubuntu.com-20090618101956-9njw6b6me6anb787
parent: pqm at pqm.ubuntu.com-20090618084900-qaovz1y13j10u3p9
parent: jml at canonical.com-20090618090638-d6hgb1qjai3y4nmn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-18 11:19:56 +0100
message:
(jelmer) Fix the nested tree flag check so upgrade from dev formats
works. Bug 388727.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4431.5.3
revision-id: jml at canonical.com-20090618090638-d6hgb1qjai3y4nmn
parent: jml at canonical.com-20090618085801-1dm3hzu82al187bb
committer: Jonathan Lange <jml at canonical.com>
branch nick: fix-subtree-check
timestamp: Thu 2009-06-18 19:06:38 +1000
message:
Add a NEWS entry for jelmer's fix.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4431.5.2
revision-id: jml at canonical.com-20090618085801-1dm3hzu82al187bb
parent: jml at canonical.com-20090618075035-3ab6i2vwg3iuv1b3
parent: pqm at pqm.ubuntu.com-20090618084900-qaovz1y13j10u3p9
committer: Jonathan Lange <jml at canonical.com>
branch nick: fix-subtree-check
timestamp: Thu 2009-06-18 18:58:01 +1000
message:
Bring in recent 1.16 changes.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 4431.5.1
revision-id: jml at canonical.com-20090618075035-3ab6i2vwg3iuv1b3
parent: pqm at pqm.ubuntu.com-20090612054923-1mnu2u4g0goat507
parent: jelmer at samba.org-20090605122104-3oppcvuy5809luqt
committer: Jonathan Lange <jml at canonical.com>
branch nick: fix-subtree-check
timestamp: Thu 2009-06-18 17:50:35 +1000
message:
Merge in jelmer's subtree check fix.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4413.3.2
revision-id: jelmer at samba.org-20090605122104-3oppcvuy5809luqt
parent: jelmer at samba.org-20090605122047-uy811bvuei35d5la
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Fri 2009-06-05 14:21:04 +0200
message:
During groupcompress repository upgrades, only require subtree support in the target if the source had subtree support.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4431.3.4
revision-id: pqm at pqm.ubuntu.com-20090618084900-qaovz1y13j10u3p9
parent: pqm at pqm.ubuntu.com-20090612054923-1mnu2u4g0goat507
parent: andrew.bennetts at canonical.com-20090618034513-uulsnlgb0wrcgidd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-18 09:49:00 +0100
message:
(andrew) Cherrypick fix for bug 388675 (landed in bzr.dev r4458)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 4431.4.1
revision-id: andrew.bennetts at canonical.com-20090618034513-uulsnlgb0wrcgidd
parent: pqm at pqm.ubuntu.com-20090612054923-1mnu2u4g0goat507
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-1.16
timestamp: Thu 2009-06-18 13:45:13 +1000
message:
Cherry-pick fix for #388675.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
=== 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)
More information about the bazaar-commits
mailing list