"Create a merge proposal" tip appears when a merge proposal already exists
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Fix Released
|
Low
|
Simone Pelosi | ||
| turnip |
In Progress
|
Low
|
Colin Watson | ||
Bug Description
I noticed a bug in a git-based MP, fixed it, and force pushed the branch. That produced the following output:
$ git push racb +smart-whitelisting
Counting objects: 6, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 3.04 KiB | 0 bytes/s, done.
Total 6 (delta 5), reused 0 (delta 0)
remote:
remote: Create a merge proposal for 'smart-
remote: https:/
remote:
To git+ssh://<email address hidden>
+ 0f4035a...98287cd smart-whitelisting -> smart-whitelisting (forced update)
Expected result: no tip, or some tip acknowledging that an MP already exists, since it doesn't really make sense to create a new MP in this case, in general anyway.
Related branches
- Colin Watson (community): Approve
-
Diff: 351 lines (+195/-18)7 files modifiedlib/lp/code/interfaces/branchmergeproposal.py (+7/-0)
lib/lp/code/interfaces/gitapi.py (+16/-0)
lib/lp/code/interfaces/gitrepository.py (+15/-0)
lib/lp/code/model/branchmergeproposal.py (+21/-17)
lib/lp/code/model/gitrepository.py (+8/-1)
lib/lp/code/xmlrpc/git.py (+71/-0)
lib/lp/code/xmlrpc/tests/test_git.py (+57/-0)
- Simone Pelosi: Approve
-
Diff: 293 lines (+62/-64)5 files modifiedturnip/pack/hookrpc.py (+14/-13)
turnip/pack/hooks/hook.py (+6/-11)
turnip/pack/tests/fake_servers.py (+8/-8)
turnip/pack/tests/test_hookrpc.py (+18/-19)
turnip/pack/tests/test_hooks.py (+16/-13)
| tags: | added: code-review confusing-ui lp-code |
| Changed in launchpad: | |
| status: | New → Triaged |
| importance: | Undecided → Low |
| Robie Basak (racb) wrote | #1 |
| Changed in turnip: | |
| status: | New → Triaged |
| importance: | Undecided → Low |
| Changed in launchpad: | |
| status: | Triaged → Fix Committed |
| assignee: | nobody → Simone Pelosi (pelpsi) |
| Changed in turnip: | |
| status: | Triaged → In Progress |
| assignee: | nobody → Colin Watson (cjwatson) |
| Colin Watson (cjwatson) wrote | #2 |
| Changed in launchpad: | |
| status: | Fix Committed → Fix Released |
I noticed today when adding a commit to the end of the branch (no force pushing). So a force push/rebase isn't a requirement to trigger this behaviour.