Merge lp:~jelmer/bzr-builddeb/merge-upstream-revision into lp:bzr-builddeb
Proposed by
Jelmer Vernooij
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | James Westby | ||||
Approved revision: | 645 | ||||
Merged at revision: | 643 | ||||
Proposed branch: | lp:~jelmer/bzr-builddeb/merge-upstream-revision | ||||
Merge into: | lp:bzr-builddeb | ||||
Diff against target: |
160 lines (+65/-16) 5 files modified
cmds.py (+12/-4) debian/changelog (+1/-1) import_dsc.py (+7/-7) tests/blackbox/test_merge_upstream.py (+34/-0) upstream/branch.py (+11/-4) |
||||
To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/merge-upstream-revision | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby | Approve | ||
Review via email: mp+81868@code.launchpad.net |
Description of the change
Fix the support for the -r argument to "bzr merge-upstream", when used without any arguments like --version.
In addition, allow merging upstream revisions that don't have a matching version in the primary upstream source.
To post a comment you must log in.