Merge lp:~lifeless/bzr-builddeb/trunk into lp:bzr-builddeb
Proposed by
Robert Collins
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 448 | ||||||||||||||||
Proposed branch: | lp:~lifeless/bzr-builddeb/trunk | ||||||||||||||||
Merge into: | lp:bzr-builddeb | ||||||||||||||||
Diff against target: | 0 lines | ||||||||||||||||
To merge this branch: | bzr merge lp:~lifeless/bzr-builddeb/trunk | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby | Approve | ||
Review via email: mp+24578@code.launchpad.net |
Description of the change
Add an import-upstream command.
I've tried to refactor things as much as possible to get code reuse, but the DistributionBranch was a little large and opaque; I hope the things I've done make sense to you; please tell me anything that doesn't and I'll fix it up. This feature would fix a common failure I saw when trying to help people use merge-upstream on existing [that is, well maintained :P] bzr packaging branches at the Ubuntu portland sprint.
To post a comment you must log in.
Hi,
This looks good to me, thanks.
There's one thing that I think is missing though, tests and
code for when there is an existing artefact from the previous
version. It appears to me as if this code will not use that
as the left-hand parent of the created revision.
Plus two smaller things:
119 + db.branch. repository. fetch
looks wrong to me, and I would like a trace.note() or similar
that explains how the user can get at the newly imported
revision. Yes, it's the tag named upstream-$VERSION with the
version they provided, but a note will mean that people don't
have to infer that.
Thanks,
James