Rev 6502: Open 2.5.2 for bug fixes in http://bazaar.launchpad.net/~vila/bzr/2.5-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6502
revision-id: v.ladeuil+lp at free.fr-20120522152845-drrs6v8eowdlibxi
parent: pqm at pqm.ubuntu.com-20120522150207-ur0xnky0nzeg0nkw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.5.1-dev
timestamp: Tue 2012-05-22 17:28:45 +0200
message:
  Open 2.5.2 for bug fixes
-------------- next part --------------
=== modified file 'bzr'
--- a/bzr	2012-02-24 12:15:02 +0000
+++ b/bzr	2012-05-22 15:28:45 +0000
@@ -25,7 +25,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 5, 1)
+_script_version = (2, 5, 2)
 
 NEED_VERS = (2, 6)
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2012-05-22 14:06:21 +0000
+++ b/bzrlib/__init__.py	2012-05-22 15:28:45 +0000
@@ -55,7 +55,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, 5, 1, 'final', 0)
+version_info = (2, 5, 2, 'dev', 0)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-05-22 14:06:21 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-05-22 15:28:45 +0000
@@ -5,12 +5,64 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.5.2
+#########
+
+:2.5.2: NOT RELEASED YET
+
+External Compatibility Breaks
+*****************************
+
+.. These may require users to change the way they use Bazaar.
+
+New Features
+************
+
+.. New commands, options, etc that users may wish to try out.
+
+Improvements
+************
+
+.. Improvements to existing commands, especially improved performance 
+   or memory usage, or better results.
+
+Bug Fixes
+*********
+
+.. Fixes for situations where bzr would previously crash or give incorrect
+   or undesirable results.
+
+Documentation
+*************
+
+.. Improved or updated documentation.
+
+API Changes
+***********
+
+.. Changes that may require updates in plugins or other code that uses
+   bzrlib.
+
+Internals
+*********
+
+.. Major internal changes, unlikely to be visible to users or plugin 
+   developers, but interesting for bzr developers.
+
+Testing
+*******
+
+.. Fixes and changes that are only relevant to bzr's test framework and 
+   suite.  This can include new facilities for writing tests, fixes to 
+   spurious test failures and changes to the way things should be tested.
+
+
 bzr 2.5.1
 #########
 
 :2.5.1: 2012-05-22
 
-This is a bugfix release. Most of the bugs dealt https and colocated
+This is a bugfix release. Most of the bugs dealt with https and colocated
 branches glitches. Upgrading is recommended for all users of earlier 2.5
 releases.