lp://qastaging/~dobey/tarmac/merge-specific

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/tarmac at revision 430

Francis Ginther: Approve on 2014-02-28

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1267596: No way to merge a single, specific proposal

High

Fix Released

Link a bug report

Related blueprints

432. By dobey on 2014-02-24

Revert one more line.

431. By dobey on 2014-02-24

Always use the branch_url from the MP when --proposal is used.

430. By dobey on 2014-02-24

Add a couple more tests.
Fix a typo.
Revert the changes to addProposal.
Clean up the branch created by addProposal.

429. By dobey on 2014-02-24

Add an option to merge a single specific proposal to a branch.

428. By dobey on 2014-02-20

Use proposal.web_link directly instead of a regex.

427. By dobey on 2014-02-19

Add a --list-approved option to the merge command.

426. By David Britton on 2014-02-14

Better prerequisite handling.

425. By dobey on 2014-01-09

Drop the tarmac-web interface as it doesn't work and Jenkins is much better.

424. By dobey on 2013-11-08

Use the display name for the bot/person running tarmac, as committer.

423. By dobey on 2013-11-07

Add documentation for the bug resolver plug-in to introduction.txt.