launchpad-reviewers team mailing list archive

[Aaron Bentley <aaron@xxxxxxxxxxxxx>]

Aaron Bentley has proposed merging lp:~abentley/launchpad/bzr-2.2.2-lp-1 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #687653 infinite recursion trying to format NotBranchError
  https://bugs.launchpad.net/bugs/687653

For more details, see:
https://code.launchpad.net/~abentley/launchpad/bzr-2.2.2-lp-1/+merge/45258

= 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.
-- 
https://code.launchpad.net/~abentley/launchpad/bzr-2.2.2-lp-1/+merge/45258
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~abentley/launchpad/bzr-2.2.2-lp-1 into lp:launchpad.

=== 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