Merge lp://staging/~jelmer/bzr-builddeb/merge-upstream-merge-mode into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Merged at revision: | 500 |
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/merge-upstream-merge-mode |
| Merge into: | lp://staging/bzr-builddeb |
| Prerequisite: | lp://staging/~jelmer/bzr-builddeb/295274-merge-upstream-no-version |
| Diff against target: |
232 lines (+74/-57) 6 files modified
cmds.py (+27/-18) config.py (+1/-1) debian/changelog (+3/-1) tests/test_source_distiller.py (+1/-1) tests/test_upstream.py (+41/-0) upstream.py (+1/-36) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/merge-upstream-merge-mode |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Westby | Approve | ||
|
Review via email:
|
|||
Description of the change
This makes it possible for 'bzr merge-upstream' to work in merge mode branches.
Instead of merging in the upstream branch we Do The Right Thing and only update the changelog with the new upstream version.
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
