Launchpad itself

Merge lp://staging/~jelmer/launchpad/bzr-2.5.1 into lp://staging/launchpad

bzr-2.5.1
Merge into devel

Proposed by Jelmer Vernooij on 2012-06-28

Status:

Merged

Approved by:

j.c.sackett on 2012-06-29

Approved revision:

no longer in the source branch.

Merged at revision:

15901

Proposed branch:

lp://staging/~jelmer/launchpad/bzr-2.5.1

Merge into:

lp://staging/launchpad

Diff against target:

222 lines (+48/-33)

8 files modified

lib/lp/code/bzr.py (+6/-1)
lib/lp/codehosting/__init__.py (+3/-0)
lib/lp/codehosting/upgrade.py (+1/-1)
lib/lp/codehosting/vfs/transport.py (+6/-0)
lib/lp_sitecustomize.py (+14/-10)
utilities/sourcedeps.cache (+12/-12)
utilities/sourcedeps.conf (+5/-5)
versions.cfg (+1/-4)

To merge this branch:

bzr merge lp://staging/~jelmer/launchpad/bzr-2.5.1

Related bugs:

Bug #697828: git code import fails: ValueError: invalid literal for int() with base 10: '--700'	Low	Fix Released
Bug #958719: apache svn imports are failing	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
j.c.sackett (community)		2012-06-28	Approve on 2012-06-29
Review via email: mp+112523@code.staging.launchpad.net

Commit message

Update Bazaar to version 2.5.1.

Description of the change

Update Bazaar to 2.5.1. This version includes various performance improvements as well as a bunch of bug fixes.

== QA ==

I would like to cowboy this on staging first, so we can give it a more extended test run on staging. There is a fair number of changes to the HPSS in this landing, which would be good to test for a bit longer given our previous experiences updating bzr.

Revision history for this message

j.c.sackett (jcsackett) wrote on 2012-06-28:

Jelmer--

This looks alright, but I have a few concerns/questions.

1) Given you want to land this on db-devel first, you're going to need to branch from that and propose against it. I'm not sure landing there is necessary though, so you might send an email to the list to let people weigh in on if it's a good idea/necessary.

2) I see two new methods defined, but not called anywhere. Are they needed? How are they used?

review: Needs Information

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2012-06-29:

> This looks alright, but I have a few concerns/questions.
>
> 1) Given you want to land this on db-devel first, you're going to need to
> branch from that and propose against it. I'm not sure landing there is
> necessary though, so you might send an email to the list to let people weigh
> in on if it's a good idea/necessary.
I'll bring it up on the list. I was wrong to actually mention db-devel here; what I actually should have said was that I wanted to cowboy it on staging first so that we can give it a bit more testing than we usually do in QA while not blocking deployment.

We had a problematic update of bzr last year; cowboying on staging was one of the suggestions for making the next landing smoother: https://lists.ubuntu.com/mailman/private/canonical-launchpad/2011-July/067332.html

> 2) I see two new methods defined, but not called anywhere. Are they needed?
> How are they used?

The two methods are on a class that implements a bzr interface (Transport). Newer versions of Bazaar have these two extra methods , and will call them.

Revision history for this message

j.c.sackett (jcsackett) wrote on 2012-06-29:

> I'll bring it up on the list. I was wrong to actually mention db-devel here;
> what I actually should have said was that I wanted to cowboy it on staging
> first so that we can give it a bit more testing than we usually do in QA while
> not blocking deployment.
>
> We had a problematic update of bzr last year; cowboying on staging was one of
> the suggestions for making the next landing smoother:
> https://lists.ubuntu.com/mailman/private/canonical-
> launchpad/2011-July/067332.html

Ah, dig. Ok then, I'm not sure further discussion is actually necessary--I was mostly concerned about whether or not we wanted to establish bzr as a db-devel dependent update, since that means a different process than other things. If there's already been discussion about cowboying it, I suppose finish those discussions and go for it--seems like a fine idea to me.

> The two methods are on a class that implements a bzr interface (Transport).
> Newer versions of Bazaar have these two extra methods , and will call them.

Ok, that makes sense. Thanks.

review: Approve