Merge lp:~wgrant/launchpad/bug-715000-fixed-bzr into lp:launchpad

Proposed by William Grant on 2011-02-09
Status: Merged
Approved by: Robert Collins on 2011-02-09
Approved revision: no longer in the source branch.
Merged at revision: 12348
Proposed branch: lp:~wgrant/launchpad/bug-715000-fixed-bzr
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:~wgrant/launchpad/bug-715000-fixed-bzr
Reviewer Review Type Date Requested Status
Robert Collins (community) 2011-02-09 Approve on 2011-02-09
Review via email: mp+49017@code.launchpad.net

Commit message

[r=lifeless][bug=715000] Upgrade to a bzr with a fix for the graph ancestry chained stacking issue.

Description of the change

Bug #715000 causes branch scans to fail when they need revision data in the stacked-on branch of their stacked-on branch. A fix is currently landing into lp:bzr/2.2, but we need this more urgently than we can deploy 2.2 tip. I've added to download-cache an egg with the patch, and confirmed that it fixes the issue.

To post a comment you must log in.
Robert Collins (lifeless) :
review: Approve

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 2011-02-04 06:30:13 +0000
3+++ versions.cfg 2011-02-09 05:47:55 +0000
4@@ -7,7 +7,7 @@
5 ampoule = 0.2.0
6 BeautifulSoup = 3.1.0.1
7 # from lp:~launchpad/bzr/2.2-lp
8-bzr = 2.2.2-lp-1
9+bzr = 2.2.2-lp-2
10 chameleon.core = 1.0b35
11 chameleon.zpt = 1.0b17
12 ClientForm = 0.2.10