Page MenuHomePhabricator
Create Task
Maniphest T266860

Line breaks get lost when resolving edit conflicts
Closed, ResolvedPublic3 Estimated Story Points
Actions

Description

Reported here: https://www.mediawiki.org/wiki/Topic:Vws56wply7n661h0

Edit made in the background: https://en.wikipedia.org/wiki/Special:Diff/986155840
The users edit that run into a conflict: https://en.wikipedia.org/wiki/Special:Diff/986157929
What the user had to fix because of the lost line breaks: https://en.wikipedia.org/wiki/Special:Diff/986158379

I played the edits back, and can reproduce the issue.

Details

SubjectRepoBranchLines +/-
Fix two edge-case bugs in whitespace-only detectionmediawiki/extensions/TwoColConflictmaster+36 -2
Fix empty lines being skipped during mergemediawiki/extensions/TwoColConflictmaster+48 -0
Customize query in gerrit

Related Objects

Event Timeline

thiemowmde created this task.Oct 30 2020, 10:49 AM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptOct 30 2020, 10:49 AM
thiemowmde moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2020-10-21 board.Oct 30 2020, 10:50 AM
thiemowmde set the point value for this task to 2.
gerritbot added a comment.Oct 30 2020, 12:28 PM

Change 637687 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Fix empty lines being skipped during merge

https://gerrit.wikimedia.org/r/637687

gerritbot added a project: Patch-For-Review.Oct 30 2020, 12:28 PM
thiemowmde triaged this task as High priority.Oct 30 2020, 12:32 PM
thiemowmde moved this task from Doing to Demo on the WMDE-QWERTY-Sprint-2020-10-21 board.
thiemowmde moved this task from Demo to Review on the WMDE-QWERTY-Sprint-2020-10-21 board.
thiemowmde changed the point value for this task from 2 to 3.
thiemowmde moved this task from Backlog to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.
gerritbot added a comment.Oct 30 2020, 1:29 PM

Change 637687 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Fix empty lines being skipped during merge

https://gerrit.wikimedia.org/r/637687

ReleaseTaggerBot added a project: MW-1.36-notes (1.36.0-wmf.16; 2020-11-03).Oct 30 2020, 2:00 PM
Maintenance_bot removed a project: Patch-For-Review.Oct 30 2020, 2:10 PM
thiemowmde moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2020-10-21 board.Nov 2 2020, 7:34 AM
awight closed this task as Resolved.Nov 3 2020, 1:11 PM
awight moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2020-10-21 board.
thiemowmde mentioned this in T268313: Unexpected null error when the 2-column merge form is build.Nov 20 2020, 8:45 AM
thiemowmde mentioned this in T268314: Add missing unit test for recent whitespace-only detection.Nov 20 2020, 8:57 AM
gerritbot added a comment.Nov 20 2020, 8:23 PM

Change 642525 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Fix two edge-case bugs in whitespace-only detection

https://gerrit.wikimedia.org/r/642525

gerritbot added a project: Patch-For-Review.Nov 20 2020, 8:23 PM
gerritbot added a comment.Nov 23 2020, 8:50 AM

Change 642525 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Fix two edge-case bugs in whitespace-only detection

https://gerrit.wikimedia.org/r/642525

Maintenance_bot removed a project: Patch-For-Review.Nov 23 2020, 9:11 AM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits