Rev 5610: (vila) Release 2.3b5 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.3/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Jan 13 22:38:19 UTC 2011
At file:///home/pqm/archives/thelove/bzr/2.3/
------------------------------------------------------------
revno: 5610 [merge]
revision-id: pqm at pqm.ubuntu.com-20110113223818-xhljsj730qcthtwo
parent: pqm at pqm.ubuntu.com-20110113165202-44k299aa1yzyy6yk
parent: v.ladeuil+lp at free.fr-20110113215132-npfdr55cvf22nidm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Thu 2011-01-13 22:38:18 +0000
message:
(vila) Release 2.3b5 (Vincent Ladeuil)
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2010-12-02 16:24:54 +0000
+++ b/bzrlib/__init__.py 2011-01-13 21:51:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -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, 'dev', 5)
+version_info = (2, 3, 0, 'beta', 5)
# API compatibility version
api_minimum_version = (2, 3, 0)
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2011-01-10 22:20:12 +0000
+++ b/bzrlib/errors.py 2011-01-13 21:51:32 +0000
@@ -2023,7 +2023,7 @@
class BzrBadParameterMissing(BzrBadParameter):
- _fmt = "Parameter $(param)s is required but not present."
+ _fmt = "Parameter %(param)s is required but not present."
class BzrBadParameterUnicode(BzrBadParameter):
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2010-12-17 08:35:38 +0000
+++ b/doc/developers/releasing.txt 2011-01-13 21:51:32 +0000
@@ -163,7 +163,7 @@
Double check that ./bzr ``_script_version`` matches ``version_info``. Check
the output of ``bzr --version``.
- For betahttps://code.edge.launchpad.net/~knittl/bzr/fix-inventory-r0/+merge/354985 releases use::
+ For beta releases use::
version_info = (2, 1, 0, 'beta', SERIAL)
@@ -251,7 +251,7 @@
appropriate release branch::
bzr push
- bzr pqm-submit -m "(mbp) prepare 1.14"
+ bzr pqm-submit -m "(mbp) Release 1.14 (Martin Pool)"
Or with hydrazine::
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt 2011-01-12 23:37:16 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt 2011-01-13 21:51:32 +0000
@@ -8,24 +8,27 @@
bzr 2.3b5
#########
-:2.3.b5: NOT RELEASED YET
+:2.3.b5: 2011-01-13
+
+This is the fifth and **last** beta of the 2.3 series, leading up to a 2.3.0
+release in February. Beta releases are suitable for everyday use but may cause
+some incompatibilities with plugins.
+
+2.3b5 includes bug fixes for committing to stacked branches, smoother upgrades
+of multiple branches, compatibility with python-2.7, full test suite passing
+on Ubuntu Natty and windows, less round-trips for several smart server
+operations, better support text conflicts resolve actions and some more.
+
+All known fixed bugs in other series (2.0, 2.1, 2.2) are also included here.
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.
-
* A redundant parent inventories calculation was removed from
``fetch.py``, as ``Repository.insert_stream`` already reports any
missing inventories. This removes at least one network roundtrip when
@@ -104,17 +107,12 @@
Documentation
*************
-.. Improved or updated documentation.
-
* Better document the rules to update the bzr freshmeat page when
doing a release. (Vincent Ladeuil, #690515)
API Changes
***********
-.. Changes that may require updates in plugins or other code that uses
- bzrlib.
-
* ``Branch.sprout``, ``BranchFormat.initalize`` and
``ControlDir.create_branch`` now take an optional ``repository`` keyword
argument, and ``BranchFormat.open`` now takes an optional
@@ -127,19 +125,10 @@
the bzr-2.4 series. Code that was using it can just use the python
stdlib ``gzip.GzipFile``. (John Arbash Meinel)
-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.
-
* ``bzrlib.tests`` defines ``isolated_environ`` with the definitions of all
the environment variables the tests should care about. It also defines
``override_os_environ`` and ``restore_os_environ`` to properly implement
@@ -161,7 +150,7 @@
instead. (Vincent Ladeuil)
* ``TestDebuntuExpansions`` was escaping the test isolation by calling the
- wrong base class ``setUp``. (Vincent Ladeuil, #684622)
+ wrong base class ``setUp``. (Vincent Ladeuil, #684662)
bzr 2.3b4
#########
More information about the bazaar-commits
mailing list