Page MenuHomePhabricator

Edit conflicts with yourself are not detected when doing no section edit - inconsistent behavior
Open, NormalPublic

Description

Author: saibotrash

Description:
That is in 1.18 production wiki.

Edits made in two tabs with opening https://de.wikipedia.org/w/index.php?title=Datei:Logo_African_Pygmy_Goat.png&action=edit in both

Second edit overwrote the first edit - there must be displayed an edit conflict but it was not.

Correct and expected behavior can be observed here:
Same but edits made with https://de.wikipedia.org/w/index.php?title=Datei:Logo_African_Pygmy_Goat.png&action=edit&section=2 (note the section param!)
*first edit: https://de.wikipedia.org/w/index.php?title=Datei:Logo_African_Pygmy_Goat.png&diff=99714085&oldid=99713610
*second edit: Result on saving the second edit: edit conflict (I had added "barfoo" at the same place where I had added "foobar" (first edit).

Another example where there was no EC displayed: https://de.wikipedia.org/w/index.php?title=Datei_Diskussion:Logo_African_Pygmy_Goat.png&diff=99711750&oldid=99711748

Also no EC displayed in MW 1.19 testwiki: https://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=35606&oldid=35605
and: https://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=35626&oldid=35625
Similarly no EC is shown in MW 1.19 (resulting in "overwriting" the older edit) if: a) both edits are made by the same user, b) the second edit is done via "edit" at top and not using sections.

To repeat:

  • If the second edit is done with a section parameter: a EC is (correctly) detected...
  • If the users making the edits are different user accounts: a EC is (correctly) detected...

Version: 1.19
Severity: normal
See Also:
T30720: Do not suppress conflicts for same user edits
T28821: Edit conflict appearing when there is none: self-conflict in section edit not suppressed
T58849: Edit conflict detection by timestamp should be deprecated

Details

Reference
bz34423

Event Timeline

bzimport raised the priority of this task from to Normal.Nov 22 2014, 12:16 AM
bzimport set Reference to bz34423.
bzimport added a subscriber: Unknown Object (MLST).
bzimport created this task.Feb 15 2012, 7:27 PM

bugzilla-wikimedia-org.20.quedel wrote:

Thanks to user:Saibo, without him, i never could make such a well bugzilla-report.

saibotrash wrote:

(In reply to comment #1)

Thanks to user:Saibo, without him, i never could make such a well
bugzilla-report.

:-) That said, Quedel discovered that bug and tested together with me. :-) Okay enough honoring now! ;-)

Does this happen only when using the same browser? What if you are using two different browsers and two different users?

Doh, missed this bit:

  • If the users making the edits are different user accounts: a EC is

(correctly) detected...

prioritizing accordingly.

bugzilla-wikimedia-org.20.quedel wrote:

So, I tested it: using Firefox 10.0.1 and IE8. I have try a test-run. While 1, 2, 3 ... is the number of run, a is the first saved, b the second. Here I only give the second-edit link, so deletions of first edit can be easily seen.

https://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=36069 : both on FF, both logged in, edited in two tabs: the second edit is deleting the first one.

https://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=36071 : first on FF logged-in, second on IE logged-off. Both edits are combined.

https://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=36073 : first on IE logged-off, second on FF logged-in. Both edits are combined.

https://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=36075 : first edit on IE logged-in, second on FF logged-in, the second edit is deleting the first one.

http://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=36077 : first edit on FF logged-off, second on IE logged-off, a edit-conflict was shown.

http://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=35627 : first edit User:Quedel, second edit User:Saibo on the same row. Second edit deletes the first one.

So it seems that it can be reproduced for logged-in-users only. If one or two browsers are used; if one or two users are doing this - everytime the second edit is deleting the first (if full-article-editing, not section-param-editing).

bugzilla-wikimedia-org.20.quedel wrote:

I have to correct

#
http://test2.wikipedia.org/w/index.php?title=File:AaatestSonnepalmenstrand-portrait_new.jpg&diff=next&oldid=35627
: first edit User:Quedel, second edit User:Saibo on the same row. Second edit
deletes the first one.
So it seems that it can be reproduced for logged-in-users only. If one or two
browsers are used; if one or two users are doing this - everytime the second
edit is deleting the first (if full-article-editing, not
section-param-editing).

We tested it again

http://test2.wikipedia.org/w/index.php?title=File%3AAaatestSonnepalmenstrand-portrait_new.jpg&revisiondelete=Gew%C3%A4hlte+Versionen+zeigen%2Fverstecken&diff=36080&oldid=36079&revisiondelete=Gew%C3%A4hlte+Versionen+zeigen%2Fverstecken

If the users make the edits, both edits were combined in this case.

To say, that all tests (including on Comment 5) were made on two different lines, not editing the same line / words.

bugzilla-wikimedia-org.20.quedel wrote:

If two logged-in users made changes on the same word, a edit-conflict is shown.

EditPage.php has some checks for edit conflicts. The comment at that place is:

Suppress edit conflict with self, except for section edits where merging is required.

(In reply to comment #8)

EditPage.php has some checks for edit conflicts. The comment at that place
is:
Suppress edit conflict with self, except for section edits where merging is
required.

Bug 28720 requests to remove that behaviour and has more background.

awight added a subscriber: awight.Apr 9 2015, 8:10 AM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJul 26 2015, 7:50 AM