Rev 5855: Prepare merging 2.3.3 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5855 [merge]
revision-id: v.ladeuil+lp at free.fr-20110513125105-nfqzhavkffbzatjj
parent: v.ladeuil+lp at free.fr-20110512163248-q6ri4baji6bv6k0c
parent: v.ladeuil+lp at free.fr-20110513122750-u9r4wxz4j3xcwj3w
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2011-05-13 14:51:05 +0200
message:
  Prepare merging 2.3.3 into trunk
modified:
  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
-------------- next part --------------
=== 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 12:51:05 +0000
@@ -5,27 +5,49 @@
 .. toctree::
    :maxdepth: 1
 
+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: NOT RELEASED YET
+: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
 *****************************
 
-.. These may require users to change the way they use Bazaar.
+None
 
 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.
-
 * 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 +58,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 +91,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 12:51:05 +0000
@@ -20,6 +20,8 @@
 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.
+
 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,