Merge lp://staging/~jelmer/bzr-builddeb/upstream-parents-per-component into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | James Westby |
Approved revision: | 623 |
Merged at revision: | 627 |
Proposed branch: | lp://staging/~jelmer/bzr-builddeb/upstream-parents-per-component |
Merge into: | lp://staging/bzr-builddeb |
Prerequisite: | lp://staging/~jelmer/bzr-builddeb/version-as-revisions |
Diff against target: |
357 lines (+65/-69) 7 files modified
cmds.py (+14/-10) dh_make.py (+2/-2) import_dsc.py (+17/-14) tests/blackbox/test_merge_upstream.py (+1/-1) tests/test_import_dsc.py (+6/-6) tests/test_upstream.py (+13/-4) upstream/pristinetar.py (+12/-32) |
To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/upstream-parents-per-component |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby | Approve | ||
Review via email: mp+77070@code.staging.launchpad.net |
Description of the change
Pass parents for upstream revisions around per component.
To post a comment you must log in.
10 + for tversion, tcomponents in db.pristine_ upstream_ source. iter_versions( ): versions[ Version( version) ] = tcomponents
11 + tagged_
Just wanted to check that it is intentional that tversion isn't used in the loop.
Thanks,
James