Merge lp:~abentley/launchpad/parse-binary-2 into lp:launchpad

Proposed by Aaron Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~abentley/launchpad/parse-binary-2
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~abentley/launchpad/parse-binary-2
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) release-critical Approve
Graham Binns (community) code Approve
Review via email: mp+14915@code.launchpad.net

Commit message

New bzr to fix binary-parsing oopses

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

This patch updates bzr to fix parsing of "binary files differ" sections
(i.e. bug #436325). The earlier landing was unfortunately a mostly-useless
partial fix.

This fixes an OOPS, so I'm proposing it for cherrypicking.

bzr-2.0-lp-3 adds a cherrypick of a fix that has already been applied to the
bzr 2.0 series. We plan to upgrade to the latest bzr beta soon, but want this
fix applied to production.

Revision history for this message
Graham Binns (gmb) :
review: Approve (code)
Revision history for this message
Francis J. Lacoste (flacoste) :
review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'versions.cfg'
2--- versions.cfg 2009-11-10 14:41:33 +0000
3+++ versions.cfg 2009-11-16 17:40:33 +0000
4@@ -7,7 +7,7 @@
5 # 4674:lp:~launchpad/bzr/2.0.0-lp
6 # This fixes various oopses.
7 # To generate tarball: "make dist" and rename to taste.
8-bzr = 2.0.0-lp-2
9+bzr = 2.0.0-lp-3
10 chameleon.core = 1.0b35
11 chameleon.zpt = 1.0b17
12 ClientForm = 0.2.10