Merge lp://qastaging/~dobey/tarmac/merge-specific into lp://qastaging/tarmac
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 432 | ||||
| Merged at revision: | 430 | ||||
| Proposed branch: | lp://qastaging/~dobey/tarmac/merge-specific | ||||
| Merge into: | lp://qastaging/tarmac | ||||
| Diff against target: |
167 lines (+73/-8) 3 files modified
tarmac/bin/commands.py (+19/-3) tarmac/bin/options.py (+4/-0) tarmac/tests/test_commands.py (+50/-5) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dobey/tarmac/merge-specific | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Francis Ginther | Approve | ||
|
Review via email:
|
|||
Commit message
Add an option to merge a single specific proposal to a branch.
Description of the change
This adds the --proposal option to the tarmac merge command, so that a specific proposal can be merged. The argument is the web link to the MP to be merged. Passing this argument to the merge command will result in tarmac attempting to merge only that MP, and no others, not even branches for other targets which are set up in tarmac.conf.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This implements the requested feature. Tests and code changes look good.