Rev 6016: Open trunk as 2.5dev1 in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6016
revision-id: v.ladeuil+lp at free.fr-20110711074959-igi048gv89bfc93d
parent: pqm at pqm.ubuntu.com-20110707154803-vr68i08940zpfumi
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2011-07-11 09:49:59 +0200
message:
  Open trunk as 2.5dev1
-------------- next part --------------
=== modified file 'bzr'
--- a/bzr	2011-07-01 21:48:58 +0000
+++ b/bzr	2011-07-11 07:49:59 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 4, 0)
+_script_version = (2, 5, 0)
 
 try:
     version_info = sys.version_info

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-07-07 15:06:49 +0000
+++ b/bzrlib/__init__.py	2011-07-11 07:49:59 +0000
@@ -52,7 +52,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, 4, 0, 'dev', 6)
+version_info = (2, 5, 0, 'dev', 1)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== added file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	1970-01-01 00:00:00 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-07-11 07:49:59 +0000
@@ -0,0 +1,61 @@
+####################
+Bazaar Release Notes
+####################
+
+.. toctree::
+   :maxdepth: 1
+
+bzr 2.5b1
+#########
+
+:2.5b1: 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.
+
+
+..
+   vim: tw=74 ft=rst ff=unix

=== added file 'doc/en/whats-new/whats-new-in-2.5.txt'
--- a/doc/en/whats-new/whats-new-in-2.5.txt	1970-01-01 00:00:00 +0000
+++ b/doc/en/whats-new/whats-new-in-2.5.txt	2011-07-11 07:49:59 +0000
@@ -0,0 +1,36 @@
+*************************
+What's New in Bazaar 2.5?
+*************************
+
+Bazaar 2.5 is still under development, and will be released in February 2012.
+This document accumulates a high level summary of what's changed.  See the
+:doc:`../release-notes/index` for a full list.
+
+Users are encouraged to upgrade from the other stable series.  This
+document outlines the improvements in Bazaar 2.5 vs Bazaar 2.4. As well as
+summarizing improvements made to the core product, it highlights
+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,
+2.1, 2.2, 2.3 and 2.4, and can read and write repositories generated by all
+previous versions.
+
+Further information
+*******************
+
+For more detailed information on the changes made, see the the
+:doc:`../release-notes/index` for:
+
+* the interim bzr `milestones <https://launchpad.net/bzr/2.5>`_
+* the plugins you use.
+
+For a summary of changes made in earlier releases, see:
+
+* :doc:`whats-new-in-2.1`
+* :doc:`whats-new-in-2.2`
+* :doc:`whats-new-in-2.3`
+* :doc:`whats-new-in-2.4`
+
+..
+   vim: tw=74 ft=rst ff=unix