Merge lp://staging/~jelmer/bzr-builddeb/refactor-upstream-4 into lp://staging/~jelmer/bzr-builddeb/refactor-upstream-2
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Merge reported by: | Jelmer Vernooij |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/refactor-upstream-4 |
| Merge into: | lp://staging/~jelmer/bzr-builddeb/refactor-upstream-2 |
| Diff against target: |
1321 lines (+405/-364) 9 files modified
cmds.py (+25/-32) import_dsc.py (+37/-166) merge_package.py (+1/-1) tests/test_import_dsc.py (+17/-37) tests/test_upstream.py (+85/-16) tests/test_util.py (+0/-49) upstream/__init__.py (+122/-5) upstream/branch.py (+51/-2) util.py (+67/-56) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/refactor-upstream-4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Westby (community) | Approve | ||
| Jelmer Vernooij | Pending | ||
|
Review via email:
|
|||
Description of the change
More upstream.py refactoring.
Trim import_dsc a bit and move the various functions specific to the upstream branch and the
pristine branch onto PristineTarSource and UpstreamBranchS
Where possible, use either of these sources.
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
