Please expose a method for creating a merge proposals
Bug #400723 reported by
James Westby
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Fix Released
|
High
|
Aaron Bentley | ||
Bug Description
Hi,
In the package-branch importer we need to handle collisions between
uploads and bzr pushes. The plan we have is to make one win, and
then push the other off to the side so that it can be retrieved.
So that these branches aren't lost I would like to propose them for merge
back in to the branch.
Therefore I need a method to create a merge proposal given two
LP branches (sending by mail would be a pain). Please expose this.
Thanks,
James
Related branches
lp://qastaging/~abentley/launchpad/expose-bmp-creation
- Michael Hudson-Doyle: Approve
- Canonical Launchpad Engineering: Pending (code) requested
-
Diff: 56 lines (+9/-8)2 files modifiedlib/lp/code/interfaces/branch.py (+2/-2)
lib/lp/code/stories/webservice/xx-branchmergeproposal.txt (+7/-6)
- Tim Penhey (community): Approve (conditional)
-
Diff: 456 lines6 files modifiedlib/canonical/launchpad/interfaces/_schema_circular_imports.py (+6/-0)
lib/lp/code/configure.zcml (+1/-0)
lib/lp/code/interfaces/branch.py (+37/-3)
lib/lp/code/model/branch.py (+21/-2)
lib/lp/code/model/tests/test_branch.py (+24/-1)
lib/lp/code/stories/webservice/xx-branchmergeproposal.txt (+114/-30)
Revision history for this message
| Jonathan Lange (jml) wrote | #1 |
| Changed in launchpad-code: | |
| importance: | Undecided → High |
| status: | New → Triaged |
| tags: | added: api code-review trivial |
| Changed in launchpad-code: | |
| assignee: | nobody → Aaron Bentley (abentley) |
| milestone: | none → 3.1.10 |
| status: | Triaged → Fix Committed |
| Changed in launchpad-code: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
I thought this was done already!