Rev 6472: Open 2.5.0 for bugfixes (second attempt) in http://bazaar.launchpad.net/~vila/bzr/2.5-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6472
revision-id: v.ladeuil+lp at free.fr-20120203092621-uq2yrdqq2jd172dz
parent: pqm at pqm.ubuntu.com-20120203092253-fdcoliw3hui6diqv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.5b6-dev
timestamp: Fri 2012-02-03 10:26:21 +0100
message:
  Open 2.5.0 for bugfixes (second attempt)
-------------- next part --------------
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2012-02-02 16:41:04 +0000
+++ b/bzrlib/__init__.py	2012-02-03 09:26:21 +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, 'beta', 6)
+version_info = (2, 5, 0, 'dev', 7)
 
 # 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-02 16:41:04 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-02-03 09:26:21 +0000
@@ -5,6 +5,59 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.5.0
+#########
+
+:Codename: Phillip
+:2.5.0: 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.5b6
 #########
 
@@ -14,6 +67,14 @@
 2.5.0 release in March 2012. Beta releases are suitable for everyday use
 but may cause some incompatibilities with plugins.
 
+This introduces the support for colocated branches into the '2a' format in a
+backward compatible way, fix more glitches in the colocated UI, verify https
+certificates for the urllib https client implementation, fix some more
+unicode issues and more.
+
+All bugs fixed in previous series known at the time of this release are
+included.
+
 External Compatibility Breaks
 *****************************