Merge lp://staging/~lifeless/launchpad/merge into lp://staging/launchpad
Proposed by
Robert Collins
Status: | Merged |
---|---|
Approved by: | Tim Penhey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 10831 |
Proposed branch: | lp://staging/~lifeless/launchpad/merge |
Merge into: | lp://staging/launchpad |
Diff against target: |
292 lines (+95/-36) 6 files modified
lib/lp/code/configure.zcml (+0/-1) lib/lp/code/doc/branch-merge-proposals.txt (+1/-1) lib/lp/code/interfaces/branchmergeproposal.py (+3/-3) lib/lp/code/model/branchmergeproposal.py (+28/-25) lib/lp/code/model/tests/test_branchmergeproposals.py (+62/-5) lib/lp/testing/factory.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~lifeless/launchpad/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey (community) | Approve | ||
Review via email: mp+23523@code.staging.launchpad.net |
Commit message
Merge proposal tidy up: always dequeue when leaving the queued state; permit merge-failed; store the reviewed revid when queueing by default.
Description of the change
Fix a few bugs around merge proposals:
- when transitioning out of 'queued', always dequeue.
- permit transitioning to merge-failed
- use the reviewed revid by default when queueing
To post a comment you must log in.
lib/lp/ code/interfaces /branchmergepro posal.py
- change needs indenting a space
actually your indentation is all over the place in the tests too (so says the diff)
setStatus should call mergeFailed, and pass in the revision id
should also have a test where you can call setStatus for queued and pass in a revision id