Rev 5173: (vila) Merge 2.2 into bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5173 [merge]
revision-id: pqm at pqm.ubuntu.com-20100422154421-eeit8sxsvtxxherb
parent: pqm at pqm.ubuntu.com-20100422142242-02lpi0ygs2oqoump
parent: v.ladeuil+lp at free.fr-20100422133223-ha7tn2tgg54flm4t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-04-22 16:44:21 +0100
message:
  (vila) Merge 2.2 into bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2010-04-21 05:05:02 +0000
+++ b/NEWS	2010-04-22 13:32:23 +0000
@@ -5,13 +5,49 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.2.b3
+##########
+
+:2.2.b3: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+ * ``bzr selftest --parallel=subprocess`` now works correctly on win32.
+   (Gordon Tyler, #551332)
+
+
 bzr 2.2b2
 #########
 
-:2.2b2: NOT RELEASED YET
-
-Compatibility Breaks
-********************
+:2.2b2: 2010-04-16
+
+This is a somewhat early second beta of the 2.2 series, to fix a python2.4
+incompatibility in the 2.2b1 release.  It also includes a swag of
+performance, usability and correctness improvements: test feedback on all
+of these would be welcome.
+
 
 New Features
 ************
@@ -54,6 +90,9 @@
 * Fix glitch in the warning about unclean trees display.
   (Vincent Ladeuil, #562665)
 
+* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
+  (Martin Pool)
+
 * Help messages generated by ``RegistryOption.from_kwargs`` list the
   switches in alphabetical order, rather than in an undefined order.
   (Martin von Gagern, #559409)
@@ -110,9 +149,6 @@
   less.)
   (Martin Pool, #553017)
 
-Documentation
-*************
-
 API Changes
 ***********
 
@@ -129,16 +165,11 @@
   Command is now transient and only exists for the duration of ``run()``.
   (Robert Collins)
 
-Testing
-*******
-
-* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
-  (Gordon Tyler, #551332)
 
 bzr 2.2.0b1
 ###########
 
-:2.2.0b1: Not released yet
+:2.2.0b1: 2010-04-01
 
 Compatibility Breaks
 ********************