Tarmac

Merge lp://qastaging/~ubuntuone-hackers/tarmac/trunk into lp://qastaging/tarmac

Proposed by Jonathan Lange on 2012-12-18

Status:	Rejected
Rejected by:	dobey on 2013-11-04
Proposed branch:	lp://qastaging/~ubuntuone-hackers/tarmac/trunk
Merge into:	lp://qastaging/tarmac
Diff against target:	1069 lines (+532/-80) (has conflicts) 13 files modified bin/tarmac (+3/-1) docs/introduction.txt (+5/-0) tarmac/bin/__init__.py (+1/-1) tarmac/bin/commands.py (+311/-15) tarmac/bin/options.py (+12/-3) tarmac/bin/registry.py (+2/-2) tarmac/branch.py (+111/-20) tarmac/plugins/command.py (+4/-3) tarmac/plugins/commitmessage.py (+10/-6) tarmac/plugins/tests/test_commitmessage.py (+7/-2) tarmac/tests/mock.py (+2/-0) tarmac/tests/test_branch.py (+19/-14) tarmac/tests/test_commands.py (+45/-13) Text conflict in tarmac/bin/commands.py Text conflict in tarmac/bin/options.py Text conflict in tarmac/branch.py
To merge this branch:	bzr merge lp://qastaging/~ubuntuone-hackers/tarmac/trunk
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Paul Hummer		2012-12-18	Pending
Review via email: mp+140435@code.qastaging.launchpad.net

WIP MP to make the delta visible.

415. By Jonathan Lange on 2012-12-19: Fix the test failures in u1's tarmac fork
416. By Jonathan Lange on 2012-12-19: Oops. Really fix the tests.
417. By Jonathan Lange on 2012-12-19: Handle unicode output from tests. (~james-w)
418. By Jonathan Lange on 2012-12-19: Commit message plugin that sets review & bugs fixed (james-w)
419. By Jonathan Lange on 2012-12-20: Make the tests pass.
420. By Jonathan Lange on 2012-12-20: Merge James's branch to break up _do_merges, plus changes from my review.
421. By Jonathan Lange on 2012-12-20: Merge exit-status
422. By Jonathan Lange on 2012-12-20: Add "check" command.
423. By Jonathan Lange on 2012-12-20: Allow verify command to be specified on command line.
424. By Sidnei da Silva on 2012-12-20: - Fix to not turn 'proposals' into a single Entry object.
425. By James Westby on 2013-01-03: Also rename the other call to set_up.
426. By dobey on 2013-01-04: Remove the broken commit plug-in.
427. By Jonathan Lange on 2013-01-15: Better error message when private branches attack
428. By Sidnei da Silva on 2013-01-16: Use HTTPError directly to make it work in Lucid.
429. By James Westby on 2013-01-23: Merge trunk.
430. By James Westby on 2013-03-13: Allow the branch name to be used in the commit message template. (David Britton)

431. By Vincent Ladeuil on 2016-07-11: Set the MP status to Merged after committing instead of waiting for lp to do so.
430. By James Westby on 2013-03-13: Allow the branch name to be used in the commit message template. (David Britton)
429. By James Westby on 2013-01-23: Merge trunk.
428. By Sidnei da Silva on 2013-01-16: Use HTTPError directly to make it work in Lucid.
427. By Jonathan Lange on 2013-01-15: Better error message when private branches attack
426. By dobey on 2013-01-04: Remove the broken commit plug-in.
425. By James Westby on 2013-01-03: Also rename the other call to set_up.
424. By Sidnei da Silva on 2012-12-20: - Fix to not turn 'proposals' into a single Entry object.
423. By Jonathan Lange on 2012-12-20: Allow verify command to be specified on command line.
422. By Jonathan Lange on 2012-12-20: Add "check" command.