Rev 6506: Release 2.6b1 in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6506
revision-id: v.ladeuil+lp at free.fr-20120315095957-p7p2eg43m8mgf92u
parent: v.ladeuil+lp at free.fr-20120315092314-4xy3vvy7bomk38oh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2012-03-15 10:59:57 +0100
message:
  Release 2.6b1
-------------- next part --------------
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2012-02-24 12:50:51 +0000
+++ b/bzrlib/__init__.py	2012-03-15 09:59:57 +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, 6, 0, 'dev', 1)
+version_info = (2, 6, 0, 'beta', 1)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-03-14 16:58:27 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-03-15 09:59:57 +0000
@@ -8,24 +8,30 @@
 bzr 2.6b1
 #########
 
-:2.6b1: NOT RELEASED YET
+:2.6b1: 2012-03-15
+
+This is the first beta for the 2.6 series, leading up to a 2.6.0 release in
+August 2012.
+
+This release includes ssl certificates verification from the urllib-based
+http implementation turned on by default, fixes some UI issues around
+colocated branches, documentation fixes and more.
+
+This release includes all bugs fixed in previous series known at the time of
+this release.
+
+Beta releases are suitable for everyday use but may cause some
+incompatibilities with plugins.  Some plugins may need small updates to work
+with 2.6b1.
 
 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.
+None.
 
 Improvements
 ************
 
-.. Improvements to existing commands, especially improved performance 
-   or memory usage, or better results.
-
 * Access to HTTPS URLs now uses the urrllib implementation by default.
   For the old pycurl-based implementation, specify ``https+pycurl://`` as
   the URL scheme when accessing a HTTPS location.
@@ -53,17 +59,12 @@
 Bug Fixes
 *********
 
-.. Fixes for situations where bzr would previously crash or give incorrect
-   or undesirable results.
-
 * Fix ``bzr config`` display for ``RegistryOption`` values.
   (Vincent Ladeuil, #930182)
 
 Documentation
 *************
 
-.. Improved or updated documentation.
-
 * Prevent lines of command descriptions starting with a dot to
   accidentally be interpreted as a roff macro in bzr(1).
   (Jelmer Vernooij, #711079)
@@ -73,9 +74,6 @@
 API Changes
 ***********
 
-.. Changes that may require updates in plugins or other code that uses
-   bzrlib.
-
 * ``GPGStrategy.do_verifications`` has been deprecated.
   (Jelmer Vernooij)
 
@@ -131,9 +129,6 @@
 Internals
 *********
 
-.. Major internal changes, unlikely to be visible to users or plugin 
-   developers, but interesting for bzr developers.
-
 * ``Tree.path2id`` now once again accepts a list of path elements
   in addition to a path. (Jelmer Vernooij)
 
@@ -142,12 +137,5 @@
   conf.get(option, expand=False) or conf.get_user_option(option,
   expand=False). (Vincent Ladeuil)
 
-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.
-
 ..
    vim: tw=74 ft=rst ff=unix