Launchpad itself

Merge lp:~mwhudson/launchpad/upgrade-bzr-git-one-more-time into lp:launchpad

  1. upgrade-bzr-git-one-more-time
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/upgrade-bzr-git-one-more-time
Merge into: lp:launchpad
Diff against target: 16 lines (+2/-2)
1 file modified
utilities/sourcedeps.conf (+2/-2)
To merge this branch: bzr merge lp:~mwhudson/launchpad/upgrade-bzr-git-one-more-time
Reviewer Review Type Date Requested Status
Tim Penhey (community) release-critical Approve
Review via email: mp+20328@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Hi Tim,

We need a newer bzr-git and dulwich to have another go at getting incremental imports to work well, as discussed.

I haven't tried the kernel with this code yet, but I did try another import (gedit) that failed in a similar way and it succeeded.

Cheers,
mwh

Revision history for this message
Tim Penhey (thumper) wrote :

On Mon, 01 Mar 2010 14:30:38 Michael Hudson wrote:
> Michael Hudson has proposed merging
> lp:~mwhudson/launchpad/upgrade-bzr-git-one-more-time into
> lp:launchpad/devel.
>
> Requested reviews:
> Tim Penhey (thumper): release-critical
>
>
> Hi Tim,
>
> We need a newer bzr-git and dulwich to have another go at getting
> incremental imports to work well, as discussed.
>
> I haven't tried the kernel with this code yet, but I did try another import
> (gedit) that failed in a similar way and it succeeded.
>
> Cheers,
> mwh
>

  review approve release-critical
  merge approved

review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.conf'
2--- utilities/sourcedeps.conf 2010-02-22 20:12:10 +0000
3+++ utilities/sourcedeps.conf 2010-03-01 01:30:36 +0000
4@@ -1,10 +1,10 @@
5 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=63
6-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=250
7+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=251
8 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=281
9 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=47
10 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2707
11 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=430
12-dulwich lp:~launchpad-pqm/dulwich/devel;revno=416
13+dulwich lp:~launchpad-pqm/dulwich/devel;revno=417
14 launchpad-loggerhead lp:~launchpad-pqm/launchpad-loggerhead/devel;revno=54
15 loggerhead lp:~launchpad-pqm/loggerhead/devel;revno=174
16 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23