Merge lp://staging/~james-w/tarmac/break-up-do-merges into lp://staging/tarmac
| Status: | Rejected |
|---|---|
| Rejected by: | dobey |
| Proposed branch: | lp://staging/~james-w/tarmac/break-up-do-merges |
| Merge into: | lp://staging/tarmac |
| Prerequisite: | lp://staging/~james-w/tarmac/utf8 |
| Diff against target: |
454 lines (+206/-192) 1 file modified
tarmac/bin/commands.py (+206/-192) |
| To merge this branch: | bzr merge lp://staging/~james-w/tarmac/break-up-do-merges |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey | Disapprove | ||
| Paul Hummer | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-01-24.
Commit message
Break up the _do_merges method.
Description of the change
This branch breaks up the _do_merges method a little, as it was huge.
I tried to keep changes to a minimum while moving the code around, but it
used "continue" for flow control, so I had to change it a little to
use return values.
(from the u1 fork)
| Paul Hummer (rockstar) wrote | # |
| Paul Hummer (rockstar) | # |
| Paul Hummer (rockstar) wrote | # |
| Paul Hummer (rockstar) wrote | # |
Unmerged revisions
- 425. By James Westby
-
Merged commit-message into break-up-do-merges.
- 424. By James Westby
-
Merged commit-message into break-up-do-merges.
- 423. By James Westby
-
Merge commit-message.
- 422. By James Westby
-
Merged commit-message into break-up-do-merges.
- 421. By James Westby
-
Merge commit-message.
- 420. By James Westby
-
Merge commit message.
- 419. By James Westby
-
Properly check the statuses of the merges when merging just one branch.
- 418. By James Westby
-
Remove the option that isn't defined yet.
- 417. By James Westby
-
Break up the very large do_merges method somewhat.
- 416. By James Westby
-
Add the commit message plugin that sets [r=<reviewer>] and bug info.
The prerequisite lp:~james-w/tarmac/utf8 has not yet been merged into lp:tarmac.