Created by Māris Fogels and last modified
Get this branch:
bzr branch lp:~mars/tarmac/fix-merge-error-updates-proposals
Only Māris Fogels can upload to this branch. If you are Māris Fogels please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Māris Fogels

Recent revisions

394. By Māris Fogels

Stale code found by reviewer comments

393. By Māris Fogels

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

392. By Māris Fogels

Fixed two broken tests

391. By Māris Fogels


390. By Māris Fogels

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

389. By Māris Fogels

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

388. By Māris Fogels

Added exception handling tests for the bundle-merge command.

387. By Māris Fogels

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

386. By Māris Fogels

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

385. By Māris Fogels

Removed a stray pdb trace

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.