Rev 5136: (vila) Release 2.2.5 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.2/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.2/

------------------------------------------------------------
revno: 5136 [merge]
revision-id: pqm at pqm.ubuntu.com-20110902181656-isxe5zxb94pbclco
parent: pqm at pqm.ubuntu.com-20110820090216-xrqcq4me2nstw4to
parent: v.ladeuil+lp at free.fr-20110901142758-yh0j4ghx5ttmzm3h
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Fri 2011-09-02 18:16:56 +0000
message:
  (vila) Release 2.2.5 (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
=== modified file 'NEWS'
--- a/NEWS	2011-08-20 07:45:34 +0000
+++ b/NEWS	2011-09-01 14:27:58 +0000
@@ -5,18 +5,26 @@
 .. contents:: List of Releases
    :depth: 1
 
+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.
+
 bzr 2.2.5
 #########
 
-:Codename: Suggestions welcome
-:2.2.5: NOT RELEASED YET
+:2.2.5: 2011-09-01
 
 Compatibility Breaks
 ********************
 
+None.
+
 New Features
 ************
 
+None.
+
 Bug Fixes
 *********
 
@@ -27,15 +35,6 @@
 * Don't crash while merging and encountering obscure path conflicts
   involving different root-ids. (Vincent Ladeuil, #805809)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
 Internals
 *********
 
@@ -43,10 +42,6 @@
   in the value string. Fix suggested by ConfigObj's author Michael Foord.
   (Alexander Belchenko, #710410)
 
-Testing
-*******
-
-
 bzr 2.1.5
 #########
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-05-17 09:57:58 +0000
+++ b/bzrlib/__init__.py	2011-09-01 14:27:58 +0000
@@ -52,7 +52,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 2, 5, 'dev', 0)
+version_info = (2, 2, 5, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 2, 0)

=== 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:48:32 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt	2011-09-01 14:27:58 +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