Rev 6045: Merge 2.3 into 2.4 in http://bazaar.launchpad.net/~vila/bzr/2.4-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.4-integration/

------------------------------------------------------------
revno: 6045 [merge]
revision-id: v.ladeuil+lp at free.fr-20110909133012-jc1d1zyqgak57123
parent: pqm at cupuasso-20110908182123-4o6q180an7ltqpp7
parent: pqm at cupuasso-20110909131019-ag68vp8ggu0k7ut3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.4.2-dev
timestamp: Fri 2011-09-09 15:30:12 +0200
message:
  Merge 2.3 into 2.4
modified:
  doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
  doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt	2011-07-06 09:22:00 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt	2011-09-09 13:30:12 +0000
@@ -5,18 +5,56 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.2.6
+#########
+
+:2.2.6: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.2.5
 #########
 
-:Codename: Suggestions welcome
-:2.2.5: NOT RELEASED YET
+:2.2.5: 2011-09-01
+
+This is a bugfix release. One regression introduced in 2.2b1 has been fixed
+for some rare conflict resolutions. Also a warning is now emmitted when
+branching an out-of-date ubuntu packaging branch. Upgrading is recommended
+for all users on earlier 2.2 releases.
 
 Compatibility Breaks
 ********************
 
+None.
+
 New Features
 ************
 
+None.
+
 Bug Fixes
 *********
 
@@ -27,15 +65,6 @@
 * Don't crash while merging and encountering obscure path conflicts
   involving different root-ids. (Vincent Ladeuil, #805809)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
 Internals
 *********
 
@@ -43,9 +72,6 @@
   in the value string. Fix suggested by ConfigObj's author Michael Foord.
   (Alexander Belchenko, #710410)
 
-Testing
-*******
-
 
 bzr 2.2.4
 #########

=== modified file 'doc/en/whats-new/whats-new-in-2.2.txt'
--- a/doc/en/whats-new/whats-new-in-2.2.txt	2011-07-05 11:54:54 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt	2011-09-09 12:32:08 +0000
@@ -38,6 +38,9 @@
 Bazaar 2.2.4 fixed a regression for some interactions with the launchpad
 server.
 
+Bazaar 2.2.5 fixed a regression in some rare conflict resolutions and warns
+when branching an out-of-date ubuntu packaging branch.
+
 See the :doc:`../release-notes/index` for details.
 
 Bazaar 2.2 is fully compatible both locally and on the network with 2.0