bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/upstream-parents-per-component into lp://staging/bzr-builddeb

  1. upstream-parents-per-component
  2. Merge into trunk
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
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.
lp://staging/~jelmer/bzr-builddeb/upstream-parents-per-component updated
623. By Jelmer Vernooij

remove unused method

Revision history for this message
James Westby (james-w) wrote :

10 + for tversion, tcomponents in db.pristine_upstream_source.iter_versions():
11 + tagged_versions[Version(version)] = tcomponents

Just wanted to check that it is intentional that tversion isn't used in the loop.

Thanks,

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches