Rev 6584: Release 2.6.0 in http://bazaar.launchpad.net/~vila/bzr/integration/

Vincent Ladeuil v.ladeuil+lp at free.fr
Sat Jul 27 10:55:58 UTC 2013


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

------------------------------------------------------------
revno: 6584
revision-id: v.ladeuil+lp at free.fr-20130727105558-ryesz39x3okeiok6
parent: v.ladeuil+lp at free.fr-20130727105522-n0kj6sxw704gm077
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Sat 2013-07-27 12:55:58 +0200
message:
  Release 2.6.0
-------------- next part --------------
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2012-07-10 12:19:23 +0000
+++ b/bzrlib/__init__.py	2013-07-27 10:55:58 +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', 3)
+version_info = (2, 6, 0, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2012-07-11 07:06:56 +0000
+++ b/doc/developers/releasing.txt	2013-07-27 10:55:58 +0000
@@ -53,7 +53,7 @@
    or improvements.
 
 #. stable releases: name ``x.y.z`` where ``x.y.`` is the series and ``z``
-   starts at 1 and is incremented. These releases are targeted at people
+   starts at 0 and is incremented. These releases are targeted at people
    that want bugfixes only and no new features.
 
 

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2013-07-14 10:59:28 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2013-07-27 10:55:58 +0000
@@ -8,13 +8,28 @@
 bzr 2.6b3
 #########
 
-:2.6b3: NOT RELEASED YET
+:Codename: Surprise
+:2.6.0: 2013-07-27
+
+This release marks the start of a new long-term-stable series. From here, we
+will only make bugfix releases on the 2.6 series (2.6.1, etc), while 2.7
+will become our new development series.
+
+This is a bugfix and polish release over the 2.4 series, with a large number
+of bugs fixed (~170 for the 2.5 series alone). The 2.5 series provides a
+faster smart protocol implementation for many operations, basic support for
+colocated branches. We have started translating bzr with the 2.5 series:
+https://translations.launchpad.net/bzr, more than 20 languages have already
+been registered but these are the early days, contributions welcome.
+
+Only a few bugfixes have been included since 2.5b6 so all known fixed bugs
+are included here.
+
+Users are encouraged to upgrade from the other stable series.
 
 External Compatibility Breaks
 *****************************
 
-.. These may require users to change the way they use Bazaar.
-
 * ``bzr lp-propose --approve`` now also adds an "Approve" vote to the merge
   proposal.  (Jonathan Lange)
 
@@ -28,6 +43,8 @@
   context (i.e. showing lines that have not changed).  Also available as the 
   named parameter 'context_lines' to bzrlib.diff.internal_diff(). (Paul Nixon)
 
+* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
+
 * The 'ping' plugin is now shipped with bzr. (Jelmer Vernooij)
 
 Improvements
@@ -80,7 +97,7 @@
   instead of failing. It's useless but harmless. (Vincent Ladeuil, #1022160)
 
 * When a missing referenced chk root error is encountered, bzr now suggests
-  running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
+  running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij)
 
 * When pushing a specific revision, create the new working tree at
   that revision. (#484516, Neil Martinsen-Burrell)
@@ -88,16 +105,13 @@
 Documentation
 *************
 
-.. Improved or updated documentation.
-
 * Clarify ``bzr config`` usages especially around other option references
   expansion. (Vincent Ladeuil, #996401)
 
 API Changes
 ***********
 
-.. Changes that may require updates in plugins or other code that uses
-   bzrlib.
+* None.
 
 Internals
 *********
@@ -147,8 +161,6 @@
 * New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``.
   (Jelmer Vernooij, #681792)
 
-* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
-
 Improvements
 ************
 

=== modified file 'doc/en/whats-new/whats-new-in-2.6.txt'
--- a/doc/en/whats-new/whats-new-in-2.6.txt	2012-01-16 13:49:34 +0000
+++ b/doc/en/whats-new/whats-new-in-2.6.txt	2013-07-27 10:55:58 +0000
@@ -2,7 +2,12 @@
 What's New in Bazaar 2.6?
 *************************
 
-Bazaar 2.6 is still under development, and will be released in Auguest 2012.
+Bazaar 2.6 has been released on the 27th of July 2013 and marks the start of
+a new long-trem stable series. From here, we will only make bugfix releases
+on the 2.6 series (2.6.1, etc)d), while 2.7 will become our new development
+series.
+
+
 This document accumulates a high level summary of what's changed.  See the
 :doc:`../release-notes/index` for a full list.
 
@@ -12,12 +17,10 @@
 enhancements within the broader Bazaar world of potential interest to those
 upgrading.
 
-Bazaar 2.5.0 is fully compatible both locally and on the network with 2.0,
+Bazaar 2.6.0 is fully compatible both locally and on the network with 2.0,
 2.1, 2.2, 2.3, 2.4 and 2.5, and can read and write repositories generated by
 all previous versions.
 
-<topics of interest here>
-
 Further information
 *******************
 



More information about the bazaar-commits mailing list