Merge lp://staging/~lifeless/launchpad/merge into lp://staging/launchpad/db-devel
Proposed by
Robert Collins
| Status: | Rejected |
|---|---|
| Rejected by: | Robert Collins |
| Proposed branch: | lp://staging/~lifeless/launchpad/merge |
| Merge into: | lp://staging/launchpad/db-devel |
| Diff against target: |
1823 lines (+855/-273) (has conflicts) 38 files modified
database/schema/security.cfg (+1/-0) lib/canonical/launchpad/doc/security-teams.txt (+2/-1) lib/canonical/launchpad/mail/commands.py (+1/-1) lib/lp/archiveuploader/tests/test_ppauploadprocessor.py (+8/-8) lib/lp/bugs/browser/bug.py (+18/-9) lib/lp/bugs/browser/bugtarget.py (+10/-1) lib/lp/bugs/configure.zcml (+1/-0) lib/lp/bugs/doc/bug-heat.txt (+22/-0) lib/lp/bugs/doc/bug.txt (+1/-1) lib/lp/bugs/doc/bugnotification-email.txt (+3/-3) lib/lp/bugs/doc/bugnotification-sending.txt (+2/-1) lib/lp/bugs/interfaces/bug.py (+12/-1) lib/lp/bugs/model/bug.py (+27/-0) lib/lp/bugs/scripts/bugheat.py (+1/-0) lib/lp/bugs/scripts/bugimport.py (+1/-1) lib/lp/bugs/scripts/tests/test_bugheat.py (+2/-2) lib/lp/bugs/tests/test_bugchanges.py (+2/-2) lib/lp/code/browser/branch.py (+13/-14) lib/lp/code/configure.zcml (+2/-1) lib/lp/code/errors.py (+23/-0) lib/lp/code/interfaces/branchmergeproposal.py (+3/-0) lib/lp/code/interfaces/codeimport.py (+29/-1) lib/lp/code/interfaces/webservice.py (+11/-0) lib/lp/code/model/branchmergeproposal.py (+11/-10) lib/lp/code/model/branchtarget.py (+20/-0) lib/lp/code/model/codeimport.py (+24/-0) lib/lp/code/model/tests/test_branchmergeproposals.py (+39/-0) lib/lp/code/model/tests/test_codeimport.py (+67/-0) lib/lp/code/stories/webservice/xx-code-import.txt (+368/-168) lib/lp/services/worlddata/doc/language.txt (+33/-1) lib/lp/services/worlddata/interfaces/language.py (+3/-2) lib/lp/services/worlddata/tests/test_doc.py (+12/-1) lib/lp/services/worlddata/tests/test_language.py (+21/-0) lib/lp/soyuz/doc/archive.txt (+2/-2) lib/lp/soyuz/doc/distroseriesqueue-translations.txt (+43/-9) lib/lp/soyuz/model/archive.py (+1/-1) lib/lp/soyuz/model/queue.py (+6/-3) lib/lp/translations/templates/language-index.pt (+10/-29) Text conflict in lib/lp/code/interfaces/webservice.py Text conflict in lib/lp/code/model/branchtarget.py Text conflict in lib/lp/code/stories/webservice/xx-code-import.txt |
| To merge this branch: | bzr merge lp://staging/~lifeless/launchpad/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical Launchpad Engineering | Pending | ||
|
Review via email:
|
|||
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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
