Rev 5557: (vila) Open trunk again as 2.3dev5 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5557 [merge]
revision-id: pqm at pqm.ubuntu.com-20101202172840-i4wtlbm8vt4wi1j0
parent: pqm at pqm.ubuntu.com-20101202165430-54e0k6w4thz4pgcm
parent: v.ladeuil+lp at free.fr-20101202162454-4qpfvnsk0rbeu7bn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-12-02 17:28:40 +0000
message:
  (vila) Open trunk again as 2.3dev5 (Vincent Ladeuil)
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-12-02 15:48:12 +0000
+++ b/bzrlib/__init__.py	2010-12-02 16:24:54 +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, 3, 0, 'beta', 4)
+version_info = (2, 3, 0, 'dev', 5)
 
 # API compatibility version
 api_minimum_version = (2, 3, 0)

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2010-12-02 15:48:12 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2010-12-02 16:24:54 +0000
@@ -5,6 +5,58 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.3b5
+#########
+
+:2.3.b5: 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.3b4
 #########
 
@@ -26,16 +78,11 @@
 External Compatibility Breaks
 *****************************
 
-.. These may require users to change the way they use Bazaar.
-
   (none)
 
 Improvements
 ************
 
-.. Improvements to existing commands, especially improved performance 
-   or memory usage, or better results.
-
 * Bazaar now caches a branch's tags while that branch is read-locked.
   This removes 1 network roundtrip from most interactions with a remote
   branch.  (Andrew Bennetts)
@@ -55,9 +102,6 @@
 Bug Fixes
 *********
 
-.. Fixes for situations where bzr would previously crash or give incorrect
-   or undesirable results.
-
 * Better message if there is an error while setting ownership of
   ``.bazaar`` directory. (Parth Malwankar, #657553)
 
@@ -87,9 +131,6 @@
 Internals
 *********
 
-.. Major internal changes, unlikely to be visible to users or plugin 
-   developers, but interesting for bzr developers.
-
 * ``BranchBuilder.build_snapshot`` now accepts parent_ids == [].
   This can be used to create a new root in the graph. (Gary van der Merwe)
 
@@ -101,10 +142,6 @@
 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 a null_output_matches_anything keyword argument with default False to
   bzrlib.tests.script.ScriptRunner.run_script to specify that the command
   output should not be checked (as opposed to expecting an empty output).