lp:~dobey/tarmac/broken-author

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:tarmac at revision 417

Mike McCracken: Approve on 2013-11-04

Diff: 46 lines (+17/-4)

2 files modified

tarmac/branch.py (+5/-2)
tarmac/tests/test_branch.py (+12/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #931654: crash merging branch

High

Fix Released

Link a bug report

Related blueprints

416. By dobey on 2013-11-04

Handle an AssertionError from bzrlib on commit, and add a test for it.

415. By dobey on 2013-10-31

Add support for merging new and changed tags.

414. By dobey on 2013-10-31

Fix plug-in loading to use execfile() rather than relying on imports.
Remove the mock.py that conflicts namespace with python-mock.
Add tests for the load_plugins code.
Add a plug-in for testing the load_plugins code with.

413. By dobey on 2013-10-31

Add TarmacMergeSkipError to be reaised for skipping a proposal without
treating it as a failed merge, for non-fatal transient issues.

412. By dobey on 2013-10-31

Add an apparmor profile for tarmac.

411. By dobey on 2013-10-31

Handle e-mail not found at all on Launchpad without crashing.

410. By dobey on 2013-10-31

Decode stdin and stdout rather than joining 8-bit strings as unicode.

409. By dobey on 2013-10-30

Export the merged tree with changes to a temporary location for testing.
Update the documentation for running the tests, as mock is now required.

408. By dobey on 2013-10-30

Remove the custom commands to simplify the setup script a bit.
Update the information passed to setup().

407. By dobey on 2013-10-29

Fix the tests to run correctly again.
Remove the dependence on twisted trial.