lp:~ubuntuone-hackers/tarmac/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:tarmac

Paul Hummer: Pending requested 2012-12-18

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

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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)

Merged branch lp:~dpb/tarmac/ls-fixes

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.

Merged branch lp:~dobey/tarmac/rm-commit-plug

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.

Merged branch lp:~james-w/tarmac/verify-command

422. By Jonathan Lange on 2012-12-20

Add "check" command.

Merged branch lp:~james-w/tarmac/check-command