Rev 6502: Release 2.5.1 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-20120522140621-aq330n5nmrlbt0z3
parent: v.ladeuil+lp at free.fr-20120522140547-nztqqc1xz42pehg8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.5.1-dev
timestamp: Tue 2012-05-22 16:06:21 +0200
message:
  Release 2.5.1
-------------- next part --------------
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2012-02-24 12:15:02 +0000
+++ b/bzrlib/__init__.py	2012-05-22 14:06: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, 1, 'dev', 0)
+version_info = (2, 5, 1, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2012-02-27 13:07:18 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2012-05-22 14:06:21 +0000
@@ -8,7 +8,7 @@
 bzr 2.4.3
 #########
 
-:2.4.2: NOT RELEASED YET
+:2.4.3: NOT RELEASED YET
 
 External Compatibility Breaks
 *****************************

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-05-22 08:10:13 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-05-22 14:06:21 +0000
@@ -8,24 +8,25 @@
 bzr 2.5.1
 #########
 
-:2.5.1: NOT RELEASED YET
+:2.5.1: 2012-05-22
+
+This is a bugfix release. Most of the bugs dealt https and colocated
+branches glitches. Upgrading is recommended for all users of earlier 2.5
+releases.
 
 External Compatibility Breaks
 *****************************
 
-.. These may require users to change the way they use Bazaar.
+None.
 
 New Features
 ************
 
-.. New commands, options, etc that users may wish to try out.
+None.
 
 Improvements
 ************
 
-.. Improvements to existing commands, especially improved performance 
-   or memory usage, or better results.
-
 * ``bzr rmbranch`` now supports removing colocated branches.
   (Jelmer Vernooij, #920653)
 
@@ -35,19 +36,19 @@
 Bug Fixes
 *********
 
-.. Fixes for situations where bzr would previously crash or give incorrect
-   or undesirable results.
-
 * Connecting with HTTPS via HTTP now correctly uses the host name of the
   destination rather than the proxy when checking certificates.
   (Martin Packman, #944696)
 
+* Fixed merge tool availability checking and invocation to search the
+  Windows App Path registry in addition to the PATH. (Gordon Tyler, #939605)
+
+* Fixed problem with getting errors about failing to open /dev/tty when using
+  Bazaar Explorer to sign commits. (Mark Grandi, #847388)
+
 * Fix UnicodeEncodeError when translated progress task messages contain
   non-ascii text. (Martin Packman, #966934)
 
-* Fixed merge tool availability checking and invocation to search the
-  Windows App Path registry in addition to the PATH. (Gordon Tyler, #939605)
-
 * Make sure configuration options can provide their own help topic.
   (Jelmer Vernooij, #941672)
 
@@ -63,22 +64,11 @@
 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.
+None.
 
 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.
-
 * Add support for pyftpdlib >= 0.7.0 and drop support for previous pyftpdlib
   versions. (Vincent Ladeuil, #956027)
 
@@ -1100,9 +1090,6 @@
   operations that use it, like merge, can now create trees without a root.
   (Aaron Bentley)
 
-* Fixed problem with getting errors about failing to open /dev/tty when using
-  Bazaar Explorer to sign commits. (Mark Grandi, #847388)
-
 Documentation
 *************
 

=== modified file 'doc/en/whats-new/whats-new-in-2.5.txt'
--- a/doc/en/whats-new/whats-new-in-2.5.txt	2012-03-09 16:48:55 +0000
+++ b/doc/en/whats-new/whats-new-in-2.5.txt	2012-05-22 14:06:21 +0000
@@ -20,6 +20,10 @@
 2.1, 2.2, 2.3 and 2.4, and can read and write repositories generated by all
 previous versions.
 
+Bazaar 2.5.1 includes all the fixes in the un-released 2.0.7, 2.1.5, 2.2.6,
+2.3.5 and 2.4.3 versions that weren't included in 2.5.0 and fixes some bugs
+on its own.
+
 Overriding configuration options from the command line
 ******************************************************