Merge lp:~jelmer/launchpad/http-git-support into lp:launchpad

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 13941
Proposed branch: lp:~jelmer/launchpad/http-git-support
Merge into: lp:launchpad
Diff against target: 77 lines (+17/-17)
2 files modified
utilities/sourcedeps.cache (+15/-15)
utilities/sourcedeps.conf (+2/-2)
To merge this branch: bzr merge lp:~jelmer/launchpad/http-git-support
Reviewer Review Type Date Requested Status
Henning Eggers (community) Approve
Review via email: mp+74010@code.launchpad.net

Commit message

[r=henninge][bug=581933] Update to a newer version of bzr-git/dulwich which supports fetching branches over http using the git smart server protocol.

Description of the change

Update to a newer version of bzr-git/dulwich which supports fetching branches over http using the git smart server protocol.

This should fix all but two of the remaining failing git imports: https://code.launchpad.net/+code-imports?field.review_status=FAILING&field.review_status-empty-marker=1&field.rcs_type=GIT&field.rcs_type-empty-marker=1&submit=Submit+Query

To post a comment you must log in.
Revision history for this message
Henning Eggers (henninge) wrote :

Oh, we need to put some order into sourcedeps.cache!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.cache'
2--- utilities/sourcedeps.cache 2011-09-02 10:28:09 +0000
3+++ utilities/sourcedeps.cache 2011-09-04 16:18:43 +0000
4@@ -1,4 +1,8 @@
5 {
6+ "bzr-builder": [
7+ 68,
8+ "launchpad@pqm.canonical.com-20101123183213-777lz46xgagn1deg"
9+ ],
10 "testresources": [
11 16,
12 "robertc@robertcollins.net-20050911111209-ee5da49011cf936a"
13@@ -27,17 +31,13 @@
14 24,
15 "launchpad@pqm.canonical.com-20100601182722-wo7h2fh0fvyw3aaq"
16 ],
17+ "lpreview": [
18+ 23,
19+ "launchpad@pqm.canonical.com-20090720061538-euyh68ifavhy0pi8"
20+ ],
21 "bzr-git": [
22- 259,
23- "launchpad@pqm.canonical.com-20110601140035-gl5merbechngjw5s"
24- ],
25- "loggerhead": [
26- 456,
27- "danilo@canonical.com-20110902102252-phc11upmjw8tz1mg"
28- ],
29- "bzr-builder": [
30- 68,
31- "launchpad@pqm.canonical.com-20101123183213-777lz46xgagn1deg"
32+ 262,
33+ "launchpad@pqm.canonical.com-20110903235714-uj1z05kc9h9mwihl"
34 ],
35 "bzr-loom": [
36 50,
37@@ -47,9 +47,9 @@
38 4,
39 "sinzui-20090526164636-1swugzupwvjgomo4"
40 ],
41- "lpreview": [
42- 23,
43- "launchpad@pqm.canonical.com-20090720061538-euyh68ifavhy0pi8"
44+ "loggerhead": [
45+ 456,
46+ "danilo@canonical.com-20110902102252-phc11upmjw8tz1mg"
47 ],
48 "difftacular": [
49 6,
50@@ -64,7 +64,7 @@
51 "launchpad@pqm.canonical.com-20110808175904-4gj24x3y21kxepcj"
52 ],
53 "dulwich": [
54- 426,
55- "launchpad@pqm.canonical.com-20110520175715-e90dzs8os0kotbm9"
56+ 429,
57+ "launchpad@pqm.canonical.com-20110903234617-a6boia6fufrjl7a0"
58 ]
59 }
60\ No newline at end of file
61
62=== modified file 'utilities/sourcedeps.conf'
63--- utilities/sourcedeps.conf 2011-09-02 10:28:09 +0000
64+++ utilities/sourcedeps.conf 2011-09-04 16:18:43 +0000
65@@ -1,10 +1,10 @@
66 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=68
67-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=259
68+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=262
69 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=290
70 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=50
71 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2717
72 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
73-dulwich lp:~launchpad-pqm/dulwich/devel;revno=426
74+dulwich lp:~launchpad-pqm/dulwich/devel;revno=429
75 difftacular lp:difftacular;revno=6
76 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=456
77 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23