Rev 5093: (vila) Open 2.2.2 for bug fixes (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: 5093 [merge]
revision-id: pqm at pqm.ubuntu.com-20100920125712-zgd0xztzylprgbh0
parent: pqm at pqm.ubuntu.com-20100918003636-z30dunuudhmnn03w
parent: v.ladeuil+lp at free.fr-20100920091357-3am90xwq7zaktpvx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Mon 2010-09-20 13:57:12 +0100
message:
  (vila) Open 2.2.2 for bug fixes (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2010-09-17 21:54:57 +0000
+++ b/NEWS	2010-09-20 09:13:57 +0000
@@ -5,6 +5,36 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.2.2
+#########
+
+:2.2.2: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.2.1
 #########
 
@@ -14,9 +44,6 @@
 2.1.3. None are critical, but upgrading is recommended for all users on
 earlier 2.2 releases.
 
-Compatibility Breaks
-********************
-
 Bug Fixes
 *********
 

=== modified file 'bzr'
--- a/bzr	2010-09-17 21:54:57 +0000
+++ b/bzr	2010-09-20 09:13:57 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 2, 1)
+_script_version = (2, 2, 2)
 
 try:
     version_info = sys.version_info

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-09-17 21:54:57 +0000
+++ b/bzrlib/__init__.py	2010-09-20 09:13:57 +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, 1, 'final', 0)
+version_info = (2, 2, 2, 'dev', 0)
 
 # API compatibility version
 api_minimum_version = (2, 2, 0)