Rev 6480: (vila) Open 2.5.1 for bugfixes (Vincent Ladeuil) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6480 [merge]
revision-id: pqm at pqm.ubuntu.com-20120224124401-7iht0m0nkx2l2ru9
parent: pqm at pqm.ubuntu.com-20120224103649-9qp2sazlacfqe8e3
parent: v.ladeuil+lp at free.fr-20120224121502-zd0v1gxfe4kvezm3
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Fri 2012-02-24 12:44:01 +0000
message:
  (vila) Open 2.5.1 for bugfixes (Vincent Ladeuil)
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzr'
--- a/bzr	2012-01-05 10:44:12 +0000
+++ b/bzr	2012-02-24 12:15:02 +0000
@@ -25,7 +25,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 5, 0)
+_script_version = (2, 5, 1)
 
 NEED_VERS = (2, 6)
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2012-02-24 10:07:50 +0000
+++ b/bzrlib/__init__.py	2012-02-24 12:15:02 +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, 0, 'final', 0)
+version_info = (2, 5, 1, '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-02-24 10:07:50 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-02-24 12:15:02 +0000
@@ -5,6 +5,58 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.5.1
+#########
+
+:2.5.1: 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.0
 #########