lp://staging/~james-w/tarmac/branch-tree-properties

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/tarmac

dobey: Disapprove on 2013-10-31

Paul Hummer: Approve on 2013-02-04

Diff: 274 lines (+80/-53)

2 files modified

tarmac/bin/commands.py (+7/-5)
tarmac/branch.py (+73/-48)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

406. By James Westby on 2013-03-13

Merge trunk.

405. By James Westby on 2013-01-31

Merged lock-contention into branch-tree-properties.

404. By James Westby on 2013-01-24

Use properties to get the branch and tree, rather than assigning at instaniation.

403. By James Westby on 2013-01-24

Continue on LockContention errors while trying to merge.

402. By James Westby on 2013-01-23

Merge trunk.

401. By Sidnei da Silva on 2012-05-26

- Fix typo, exit when merge fails too.

400. By Sidnei da Silva on 2012-05-26

- Also exit when merging more than one branch

399. By Sidnei da Silva on 2012-05-26

- Add option to merge only one MP, and use web link where possible.

398. By dobey on 2011-10-28

If the branch doesn't exist on LP, log and return, to avoid crashing

397. By dobey on 2011-10-28

Use str(object) values to compare person and team from LP