Page MenuHomePhabricator

Merging fails, resulting in revert of previous change
Closed, ResolvedPublic

Description

Author: bugzilla.wikimedia.org

Description:
Hi.
I stumbled upon a serious issue with having an edit conflict. Result of this edit conflict was me reverting the previous edit by another athor.[1]

The edit I did was just adding a single character (a '-' between 'STOL' and 'Flugzeug' in the first sentence). In the meantime, bevor i saved my edit, another user did a more complex edit, but including the character that i was about to add.[2]

As far as i realize when I saved my edit, the software recognizes that both edits can be merged. I didn't get any hint that there was an edit conflict, but my edit was just saved. Result was that just my character change was saved, reverting all of the other changed that were made by the previous edit.

[1] http://de.wikipedia.org/w/index.php?title=AVCEN_Jetpod&diff=prev&oldid=72484506
[2] http://de.wikipedia.org/w/index.php?title=AVCEN_Jetpod&diff=prev&oldid=72445940


Version: unspecified
Severity: critical
OS: Linux
Platform: PC

Details

Reference
bz22992

Event Timeline

bzimport raised the priority of this task from to Low.Nov 21 2014, 11:04 PM
bzimport set Reference to bz22992.
bzimport added a subscriber: Unknown Object (MLST).

pdhanda wrote:

I am still trying to reproduce this on my local install. Let me try switching the same version as de.wikipedia.org.

diff3 correctly handles the conflict and the code path must have detected the different submisison.
When did you click 'edit'? Did you wait 21h 48' from starting edit to submitting?

bugzilla.wikimedia.org wrote:

It's hard to tell how long I waited between entering the form und submitting, but most certainly not more than 10 to 15 minutes.

bugzilla.wikimedia.org wrote:

As mentioned by another user I not only reverted the mentioned edit by User:Hydro but also the previous edit.
It is as I would have edited the older version 72040588.[1]
But in that case I would have gotten a notice, that I am editing an older page, right?!

[1] http://de.wikipedia.org/w/index.php?title=AVCEN_Jetpod&oldid=72040588

(In reply to comment #4)

As mentioned by another user I not only reverted the mentioned edit by
User:Hydro but also the previous edit.
It is as I would have edited the older version 72040588.[1]
But in that case I would have gotten a notice, that I am editing an older page,
right?!

Right.

(In reply to comment #3)

It's hard to tell how long I waited between entering the form und submitting,
but most certainly not more than 10 to 15 minutes.

Look at the times, Hydro edited at 11:41, 28. Mär. 2010 and your edit was at 09:29, 29. Mär. 2010. So you were editing a text many hours old (from 14:49, 18. Mär. 2010 if also taking Waerfelu edit into acount).
Saving checks the version against the current one at the master, so this couldn't happen.
I suspect that flagged revs may have interferred, but all edits were autosighted, making it mroe unlikely. :/

How does this differ from bug 11922?

Indeed looks like a dup of bug 11922. Thanks Nemo!

  • This bug has been marked as a duplicate of bug 11922 ***