lp:~mars/tarmac/fix-merge-error-updates-proposals

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~launchpad/tarmac/lp-tarmac at revision 383

Diogo Matsubara (community): Approve on 2010-12-10

Diff: 285 lines (+166/-19)

4 files modified

tarmac/bin/commands.py (+18/-5)
tarmac/branch.py (+14/-12)
tarmac/tests/test_branch.py (+35/-0)
tarmac/tests/test_commands.py (+99/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #686565: bundle-merge command does not handle TarmacMergeErrors properly

High

Fix Released

Link a bug report

Related blueprints

394. By Māris Fogels on 2010-12-15

Stale code found by reviewer comments

393. By Māris Fogels on 2010-12-08

Proposals are now updated when there is a TarmacMergeError in the tarmac_bundle_merge hook.

392. By Māris Fogels on 2010-12-08

Fixed two broken tests

391. By Māris Fogels on 2010-12-08

Docstring

390. By Māris Fogels on 2010-12-08

Wrote a test for the error handling around the tarmac_bundle_merge hookpoint.

389. By Māris Fogels on 2010-12-07

Fixed how the bundle-merge command handles exceptions raised by plugins. Wrote a test for same.

388. By Māris Fogels on 2010-12-07

Added exception handling tests for the bundle-merge command.

387. By Māris Fogels on 2010-12-07

Plugins now pass their exceptions back to the target branch for proper cleanup.

386. By Māris Fogels on 2010-12-02

Added a test to check that plugin merge errors are correctly handled by the merge command.

385. By Māris Fogels on 2010-12-02

Removed a stray pdb trace