text was not displayed, but removed due edit conflict
Closed, ResolvedPublic5 Estimated Story PointsBUG REPORT
Actions

Description

Steps to Reproduce:

Made an edit in a section
while I made this one, another user edit this section
I got an edit conflict, and merged both texts
while I was merging, another sectionw as edited
edit conflict detected again, but since I've only pressed "edit section", only my section was displayed and I was not able to see a difference

Actual Results:

when I saved the edit, this happend: https://de.wikipedia.org/w/index.php?title=Wikipedia:Administratoren/Anfragen&diff=prev&oldid=191361038&diffmode=source (the second edit was not included, hence removed)

Expected Results:
The template from "Funkruf" should be automatically merged, since this was a different section.

Details

Related Changes in Gerrit:

	Subject	Repo	Branch	Lines +/-
	Added carriage returns cause auto-merging to fail	mediawiki/extensions/TwoColConflict	master	+67 -6

Customize query in gerrit

Event Timeline

Luke081515 created this task.Aug 15 2019, 12:26 PM

Restricted Application added a project: TCB-Team (now WMDE-TechWish). · View Herald TranscriptAug 15 2019, 12:26 PM

Restricted Application added a subscriber: Aklapper. · View Herald Transcript

This sounds like a serious bug that leads to data loss, hence important. As a first step we will check if this is the TwoColConflict code, or core.

thiemowmde moved this task from Backlog to Before full default on the Two-Column-Edit-Conflict-Merge board.Jan 28 2020, 12:31 PM

thiemowmde moved this task from Before full default to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.

In T230551#5836161, @thiemowmde wrote:

This sounds like a serious bug that leads to data loss, hence important. As a first step we will check if this is the TwoColConflict code, or core.

I looked into that just now. It seems that this is only happening with the TwoColConflict solution screen. The old conflict solving interface deals with the situation as you would expect.

So first of all it's strange that a second edit conflict is triggered although the edit by the third person is happening in a completely different paragraph. It might be related to the way how we merge the results of our solved edit conflict back into the normal workflow.

I also wanted to note that this seems to be independent of the fact that a section was edited. This happens with edits in the same paragraph or more precises probably line.

Andrew-WMDE claimed this task.Jan 31 2020, 9:57 AM

Andrew-WMDE moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2020-01-21 board.

Change 569242 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@master] [WIP] Added carriage returns cause auto-merging to fail

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

gerritbot added a project: Patch-For-Review.Jan 31 2020, 3:44 PM

thiemowmde added a project: WMDE-QWERTY-Sprint-2020-02-04.Feb 4 2020, 1:54 PM

thiemowmde removed Andrew-WMDE as the assignee of this task.Feb 4 2020, 1:58 PM

thiemowmde added a subscriber: Andrew-WMDE.

thiemowmde set the point value for this task to 5.Feb 4 2020, 2:11 PM

Lena_WMDE subscribed.Feb 5 2020, 8:55 AM

awight awarded a token.Feb 6 2020, 12:49 PM

Andrew-WMDE moved this task from Sprint Backlog to Review on the WMDE-QWERTY-Sprint-2020-02-04 board.Feb 7 2020, 10:45 AM

Change 569242 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Added carriage returns cause auto-merging to fail

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

ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.19; 2020-02-11).Feb 7 2020, 1:00 PM