Merge lp://qastaging/~dobey/tarmac/merge-tags into lp://qastaging/tarmac
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 414 | ||||
| Merged at revision: | 415 | ||||
| Proposed branch: | lp://qastaging/~dobey/tarmac/merge-tags | ||||
| Merge into: | lp://qastaging/tarmac | ||||
| Diff against target: |
100 lines (+45/-9) 3 files modified
tarmac/bin/commands.py (+1/-0) tarmac/branch.py (+10/-6) tarmac/tests/test_branch.py (+34/-3) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dobey/tarmac/merge-tags | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike McCracken | Approve | ||
|
Review via email:
|
|||
Commit message
Add support for merging new and changed tags.
Description of the change
This adds support for merging tags, and always overwrites the tags, so that proposed branches can delete or move tags if necessary.
To post a comment you must log in.
Revision history for this message
| Mike McCracken (mikemc) | # |
review:
Approve
Revision history for this message
| Tarmac Traffic Controller (tarmac-atc) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.