Merge lp:~abentley/launchpad/bzr-2.2.2-lp-1 into lp:launchpad

[Aaron Bentley]

[r=benji,edwin-grubbs][ui=none][bug=687653] Use tip of bzr 2.2 branch.

= Summary =
Bzr 2.2.2 is the current stable release, but has some deficiencies that are
fixed in the lp:bzr/2.2 branch, including #687653 "infinite recursion
trying to format NotBranchError" and #681885 "Spurious 'properties changed'
line on incremental diffs".

== Proposed fix ==
Since we need these fixes urgently (#687653 is already a cowboy), I've taken
tip, updated the version number, and called it "2.2.2-lp-1".

== Pre-implementation notes ==
Done at thumper's request

== Implementation details ==
As always, this requires hacking setup.py to specify a static version, because
bzr's internal version numbering doesn't support versions like "2.2.2-lp-1".

== Tests ==
bin/test -v

== Demo and Q/A ==
Hard to say. Bug #687653 doesn't seem to indicate how to reproduce the
problem.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  versions.cfg

./versions.cfg
     237: Line exceeds 78 characters.

[Benji York (benji)]

Approved.

I did not review the bzr changes, but am instead assuming that the bzr
guys' review caught anything that I would have.

Regarding making the needed changes to the bzr 2.2 tip verses applying
just the changes we need to the version of bzr we currently use: If the
tests pass, I'd rather track 2.2 than diverge further from it because I
have no reason not to believe that the bzr guys make reasonable
decisions in choosing what changes to make there (i.e., low risk bug
fixes). I am not aware of any policy we have regarding this.

review: Approve (code*)

[Edwin Grubbs (edwin-grubbs)]

Approved.

Since this fix is already cowboyed, you should already know that it works, so I'm not worried about this item needing a test in Launchpad. However, I am a little worried that the new __repr__() doesn't have a comment to warn someone not to remove it. A bug can be opened for that unless there is a larger plan to simplify BzrError._format().

review: Approve (code)

=== modified file 'versions.cfg'
--- versions.cfg	2010-12-10 20:22:14 +0000
+++ versions.cfg	2011-01-05 16:27:01 +0000
@@ -6,7 +6,8 @@
 
 ampoule = 0.2.0
 BeautifulSoup = 3.1.0.1
-bzr = 2.2.2
+# from lp:~launchpad/bzr/2.2-lp
+bzr = 2.2.2-lp-1
 chameleon.core = 1.0b35
 chameleon.zpt = 1.0b17
 ClientForm = 0.2.10