Rev 5861: (vila) Merge 2.3 into trunk resolving conflicts (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri May 13 19:59:36 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5861 [merge]
revision-id: pqm at pqm.ubuntu.com-20110513195932-upsvlswzyvwodep0
parent: pqm at pqm.ubuntu.com-20110513165944-rv579ds1kciopi4n
parent: v.ladeuil+lp at free.fr-20110513162809-8vlejtvnkeifnyc7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-05-13 19:59:32 +0000
message:
(vila) Merge 2.3 into trunk resolving conflicts (Vincent Ladeuil)
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
=== modified file 'bzr'
--- a/bzr 2011-05-11 11:35:28 +0000
+++ b/bzr 2011-05-13 16:28:09 +0000
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 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
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2011-04-28 14:12:08 +0000
+++ b/bzrlib/__init__.py 2011-05-13 16:28:09 +0000
@@ -43,7 +43,7 @@
IGNORE_FILENAME = ".bzrignore"
-__copyright__ = "Copyright 2005-2010 Canonical Ltd."
+__copyright__ = "Copyright 2005-2011 Canonical Ltd."
# same format as sys.version_info: "A tuple containing the five components of
# the version number: major, minor, micro, releaselevel, and serial. All
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt 2011-05-06 15:15:44 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt 2011-05-13 16:28:09 +0000
@@ -5,10 +5,11 @@
.. toctree::
:maxdepth: 1
-bzr 2.3.2
+bzr 2.3.4
#########
-:2.3.2: NOT RELEASED YET
+:Codename: One and counting
+:2.3.4: NOT RELEASED YET
External Compatibility Breaks
*****************************
@@ -26,6 +27,80 @@
.. 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.3.3
+#########
+
+:2.3.3: 2011-05-13
+
+This is a bugfix release. Upgrading is recommended for all users of earlier
+2.3 releases.
+
+This fixed a bug in the test suite triggered by python-2.7 deprecating some
+tests helpers.
+
+Testing
+*******
+
+* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
+ `PendingDeprecationWarnings` on Python2.7.
+ (Martin Pool, #760435)
+
+
+bzr 2.3.2
+#########
+
+:2.3.2: 2011-05-12
+
+This is a bugfix release. Upgrading is recommended for all users of earlier
+2.3 releases.
+
+This was never released due to bug #760435 interrupting the release process by
+breaking the test suite under python-2.7 on natty.
+
+External Compatibility Breaks
+*****************************
+
+None
+
+New Features
+************
+
+None
+
+Improvements
+************
+
* Getting all entries from ``CHKInventory.iter_entries_by_dir()`` has been
sped up dramatically for large trees. Iterating by dir is not the best
way to load data from a CHK inventory, so it preloads all the items in
@@ -36,9 +111,6 @@
Bug Fixes
*********
-.. Fixes for situations where bzr would previously crash or give incorrect
- or undesirable results.
-
* Bazaar now infers the default user email address on Unix from the local
account name plus the contents of ``/etc/mailname`` if that file exists.
In particular, this means that committing as root through etckeeper will
@@ -72,30 +144,14 @@
(Martin Pool, #716389)
-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.
+None.
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.
-
* FreeBSD8 has switched to python-2.7 which revealed a re-occurrence of a test
failure in the launchpad plugin. ``xmlrpclib.py`` on natty carries a patch
that is not in python-2.7 upstream and masked the issue. An additional fix
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt 2011-03-11 10:58:18 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt 2011-05-13 13:11:27 +0000
@@ -20,6 +20,11 @@
Bazaar 2.3.1 includes all the fixes in the un-released 2.0.7, 2.1.4 and 2.2.5
versions that weren't included in 2.3.0 and fixes some bugs on its own.
+Bazaar 2.3.2 is a bugfix release that was never released.
+
+Bazaar 2.3.3 is a bugfix release including the fixes in 2.3.2 and
+fixing the test helpers deprecated by python-2.7.
+
See the :doc:`../release-notes/index` for details.
Bazaar 2.3 is fully compatible both locally and on the network with 2.0, 2.1,
More information about the bazaar-commits
mailing list