Merge proposal says it has conflicts when it does not
Bug #515775 reported by
Jonathan Lange
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Fix Released
|
High
|
Aaron Bentley | ||
Bug Description
My merge proposal at https:/
Diff against target: 125 lines (+121/-0) 1 file modified (has conflicts)
However, there are absolutely no conflicts in the displayed diff. Nor are there any conflicts when I do the merge manually.
Related branches
lp:~abentley/launchpad/empty-conflicts
- Francis J. Lacoste (community): Disapprove (release-critical)
- Gary Poster (community): Abstain (release-critical)
- Paul Hummer (community): Approve (code)
-
Diff: 216 lines (+104/-3)7 files modifiedlib/lp/code/browser/diff.py (+3/-2)
lib/lp/code/browser/tests/test_diff.py (+41/-0)
lib/lp/code/interfaces/diff.py (+4/-0)
lib/lp/code/model/diff.py (+4/-0)
lib/lp/code/model/tests/test_diff.py (+16/-0)
lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt (+1/-1)
lib/lp/testing/factory.py (+35/-0)
Revision history for this message
| Jonathan Lange (jml) wrote | #1 |
Revision history for this message
| Jonathan Lange (jml) wrote | #2 |
Revision history for this message
| Tim Penhey (thumper) wrote | #3 |
| Changed in launchpad-code: | |
| status: | New → Triaged |
| importance: | Undecided → High |
| assignee: | nobody → Aaron Bentley (abentley) |
Revision history for this message
| Jonathan Lange (jml) wrote | #4 |
| Changed in launchpad-code: | |
| status: | Triaged → Fix Committed |
| Changed in launchpad-code: | |
| milestone: | none → 10.02 |
| Changed in launchpad-code: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
Aaron, can I get you to take a look at this? Prep the branch from production as we may cherry pick.
Thanks, Tim