Merge lp://qastaging/~jelmer/launchpad/update-bzr-git into lp://qastaging/launchpad
Proposed by
Jelmer Vernooij
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Tim Penhey | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 11386 | ||||||||
| Proposed branch: | lp://qastaging/~jelmer/launchpad/update-bzr-git | ||||||||
| Merge into: | lp://qastaging/launchpad | ||||||||
| Diff against target: |
75 lines (+11/-13) 3 files modified
lib/lp/codehosting/codeimport/tests/servers.py (+3/-2) lib/lp/codehosting/codeimport/tests/test_worker.py (+6/-9) utilities/sourcedeps.conf (+2/-2) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~jelmer/launchpad/update-bzr-git | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Māris Fogels (community) | Approve | ||
| Tim Penhey (community) | Approve | ||
| Launchpad code reviewers | code | Pending | |
|
Review via email:
|
|||
Commit message
Update to newer versions of dulwich and bzr-git.
Description of the change
Update the versions of bzr-git and dulwich used.
This fixes two bugs, which should get ~15 of the 35 currently failing imports working again (the rest are probably caused by the remote host no longer existing, running a git server or the remote branch having disappeared).
To post a comment you must log in.
Revision history for this message
| Tim Penhey (thumper) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
As stated on IRC, the test fixes look ok, but I recommend moving the import statements up to the top of the file, and using .getUniqueString() for the message instead of 'dsadsa'.
Good to go, r=mars
Maris