Rev 5137: (vila) Open 2.2.6 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: 5137 [merge]
revision-id: pqm at pqm.ubuntu.com-20110902222304-8ajqzhtu9fjuyapi
parent: pqm at pqm.ubuntu.com-20110902181656-isxe5zxb94pbclco
parent: v.ladeuil+lp at free.fr-20110902184736-7daqja0oj7liew0y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Fri 2011-09-02 22:23:04 +0000
message:
  (vila) Open 2.2.6 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	2011-09-01 14:27:58 +0000
+++ b/NEWS	2011-09-02 18:47:36 +0000
@@ -5,16 +5,47 @@
 .. contents:: List of Releases
    :depth: 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
+#########
+
+: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.
 
-bzr 2.2.5
-#########
-
-:2.2.5: 2011-09-01
-
 Compatibility Breaks
 ********************
 

=== modified file 'bzr'
--- a/bzr	2011-05-17 09:57:58 +0000
+++ b/bzr	2011-09-02 18:47:36 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 2, 5)
+_script_version = (2, 2, 6)
 
 try:
     version_info = sys.version_info

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-09-01 14:27:58 +0000
+++ b/bzrlib/__init__.py	2011-09-02 18:47:36 +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, 'final', 0)
+version_info = (2, 2, 6, 'dev', 0)
 
 # API compatibility version
 api_minimum_version = (2, 2, 0)