Rev 5120: (vila) Release 2.2.3 (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: 5120 [merge]
revision-id: pqm at pqm.ubuntu.com-20110120203513-54ij8i153jde8lhl
parent: pqm at pqm.ubuntu.com-20110120005245-9i7zq3f8ujoy355g
parent: v.ladeuil+lp at free.fr-20110120184220-mrl22hb1jxph9z9c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Thu 2011-01-20 20:35:13 +0000
message:
  (vila) Release 2.2.3 (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-01-19 22:34:47 +0000
+++ b/NEWS	2011-01-20 18:42:20 +0000
@@ -8,7 +8,10 @@
 bzr 2.2.3
 #########
 
-:2.2.3: NOT RELEASED YET
+:2.2.3: 2011-01-20
+
+This is a bugfix release. Upgrading is recommended for all users
+on earlier 2.2 releases.
 
 Compatibility Breaks
 ********************
@@ -22,16 +25,14 @@
 New Features
 ************
 
+(none)
+
 Bug Fixes
 *********
 
 * Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
   path on windows from symlink support addition. (Martin [gz], #686611)
 
-* Fix a crash during ``RepositoryPackCollection.pack`` caused by a
-  concurrent repository pack operation.  This was particularly affecting
-  ``bzr-svn`` users.  (Andrew Bennetts, #701940)
-
 * Correctly resolve content (and path) conflicts for files in subdirs.
   (Vincent Ladeuil, #660935)
 
@@ -39,6 +40,10 @@
   because this can cause knock-on errors at awkward times.
   (Andrew Bennetts, #687653)
 
+* Fix a crash during ``RepositoryPackCollection.pack`` caused by a
+  concurrent repository pack operation.  This was particularly affecting
+  ``bzr-svn`` users.  (Andrew Bennetts, #701940)
+
 * ``https`` access works again with recent versions of python2.7.
   (Vincent Ladeuil, #693880)
 
@@ -46,21 +51,6 @@
   symlinks.  Instead, it returns False, like other Trees and methods.
   (Aaron Bentley, #681885)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
-
 
 bzr 2.2.2
 #########

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-11-26 15:50:16 +0000
+++ b/bzrlib/__init__.py	2011-01-20 18:42:20 +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, 3, 'dev', 0)
+version_info = (2, 2, 3, '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	2010-11-25 15:56:20 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt	2011-01-20 18:42:20 +0000
@@ -32,6 +32,11 @@
 
 See the :doc:`../release-notes/index` for details.
 
+Bazaar 2.2.3 focused on fixes related to interactions with the launchpad
+server and python-2.7 compatibility.
+
+See the :doc:`../release-notes/index` for details.
+
 Bazaar 2.2 is fully compatible both locally and on the network with 2.0
 and 2.1, and can read and write repositories generated by all previous
 versions.