Merge lp://staging/~jelmer/bzr-builddeb/merge-package-as-hook into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 677 | ||||||||
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/merge-package-as-hook | ||||||||
| Merge into: | lp://staging/bzr-builddeb | ||||||||
| Diff against target: |
239 lines (+77/-37) 8 files modified
__init__.py (+23/-0) cmds.py (+13/-0) debian/NEWS (+8/-1) debian/changelog (+3/-1) errors.py (+1/-1) merge_package.py (+4/-12) tests/blackbox/test_merge_package.py (+25/-0) tests/test_merge_package.py (+0/-22) |
||||||||
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/merge-package-as-hook | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Westby | Approve | ||
|
Review via email:
|
|||
Description of the change
Provide the 'bzr merge-package' functionality as a hook to 'bzr merge'.
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi,
This is great, thanks for doing it. My only question is whether
120 - 're-run the "merge-package" command to finish. '
121 + 're-run the "merge" command to finish. '
should be conditional on the bzrlib feature too?
Thanks,
James