Create Task
Maniphest T208840

Monitor user reports about imaginary conflicts
Closed, ResolvedPublic
Actions

Description

At https://www.mediawiki.org/wiki/Topic:Uny3l2uq8g8amp6w one user reports to get "the edit conflict viewer on every talk page I post on". Note this happened with the "inline" interface, before deploying the new "split" one.

Current status as of 2018-11-06:

  • We don't know if more users are affected.
  • We have not been able to reproduce the issue.
  • We assume this is a core issue and has nothing to do with the TwoColConflict extension.
  • If it is an issue with our extension, it's unlikely it will disappear with the planned T208319: Switch the TwoColConflict beta feature to its new look because both designs share code, and an issue as fundamental as the reported one is most likely in the shared part of the codebase.

Details

SubjectRepoBranchLines +/-
Revert "Disable wmgUseTwoColConflict everywhere"operations/mediawiki-configmaster+1 -3
Re-enable wmgUseTwoColConflict on dewikioperations/mediawiki-configmaster+1 -0
Re-enable wmgUseTwoColConflict on group0 onlyoperations/mediawiki-configmaster+1 -0
Fix harmless edits turning into conflictsmediawiki/extensions/TwoColConflictwmf/1.33.0-wmf.3+1 -0
Disable wmgUseTwoColConflict everywhereoperations/mediawiki-configmaster+1 -1
Fix harmless edits turning into conflictsmediawiki/extensions/TwoColConflictmaster+1 -0
Customize query in gerrit

Related Objects

Event Timeline

thiemowmde created this task.Nov 6 2018, 10:47 AM
thiemowmde added a project: WMDE-QWERTY-Sprint-2018-11-06.Nov 6 2018, 1:49 PM
thiemowmde moved this task from Sprint Backlog to Done on the WMDE-QWERTY-Sprint-2018-11-06 board.Nov 6 2018, 1:51 PM
thiemowmde moved this task from Done to Demo on the WMDE-QWERTY-Sprint-2018-11-06 board.Nov 6 2018, 2:31 PM
thiemowmde moved this task from Demo to Review on the WMDE-QWERTY-Sprint-2018-11-06 board.Nov 7 2018, 10:33 AM
gerritbot subscribed.Nov 7 2018, 3:34 PM

Change 472170 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Fix harmless edits turning into conflicts

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

gerritbot added a project: Patch-For-Review.Nov 7 2018, 3:34 PM
thiemowmde mentioned this in rESCC38db0852faff: Fix harmless edits turning into conflicts.Nov 7 2018, 3:37 PM
gerritbot added a comment.Nov 7 2018, 3:46 PM

Change 472175 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@wmf/1.33.0-wmf.3] Fix harmless edits turning into conflicts

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

thiemowmde mentioned this in rESCC1bd3fa286aaa: Fix harmless edits turning into conflicts.Nov 7 2018, 3:50 PM
gerritbot added a comment.Nov 7 2018, 3:59 PM

Change 472170 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Fix harmless edits turning into conflicts

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

ReleaseTaggerBot added a project: MW-1.33-notes (1.33.0-wmf.4; 2018-11-13).Nov 7 2018, 4:01 PM
Jarekt subscribed.Nov 7 2018, 8:40 PM

I also got imaginary conflict on my talk page trying to reply to someone, after I pressed "view changes" button. There was not way to preview or save my changes other can copy my reply, go back to reading mode, and start editing again. But if I clicked "view changes" than I would get conflict again. I tried to save my reply anyway and got this messed up page.

Niharika subscribed.Nov 7 2018, 10:46 PM

This happened to me just now. Best I can tell is that it happens if one does a Preview before submitting. I could reproduce it several times in the span of a few minutes. I got it on this page but please don't use that page to try to reproduce this. Here's what I did:

  • Go to page and make changes
  • Do preview
  • I see preview but also get edit conflict view with the last edit on that page which was made two days ago

If I make changes and just hit Submit, it doesn't give me the conflict view.

It seems like the patch above was part of today's SWAT but I'll note that the bug is still happening.

Quiddity subscribed.Nov 7 2018, 11:16 PM
valerio.bozzolan subscribed.Nov 7 2018, 11:42 PM
GKFX subscribed.Nov 8 2018, 12:18 AM

I get it on a page which isn't a talk page: https://commons.wikimedia.org/w/index.php?title=File:Vendimia_mecanizada.ogv&action=edit. I've tried navigating away and coming back; the issue remains.

• Lea_WMDE added a comment.Nov 8 2018, 10:42 AM

Hi everyone, thanks for reporting the issue! We are disabling the feature until we found the bug, this really does not sound good. If you are NOT a beta feature user of TwoColConflict, and still had these issues, please let us know!

thiemowmde triaged this task as Unbreak Now! priority.Nov 8 2018, 10:47 AM
Restricted Application added subscribers: Liuxinyu970226, TerraCodes. · View Herald TranscriptNov 8 2018, 10:47 AM
gerritbot added a comment.Nov 8 2018, 10:47 AM

Change 472409 had a related patch set uploaded (by Addshore; owner: Addshore):
[operations/mediawiki-config@master] Disable wmgUseTwoColConflict everywhere

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

gerritbot added a comment.Nov 8 2018, 10:49 AM

Change 472409 merged by jenkins-bot:
[operations/mediawiki-config@master] Disable wmgUseTwoColConflict everywhere

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

thiemowmde mentioned this in rESCC1057c93ba400: Fix harmless edits turning into conflicts.Nov 8 2018, 10:49 AM
Stashbot mentioned this in T209012: Preview on a new site breaks and leads to loose of the site content.Nov 8 2018, 10:52 AM
Stashbot subscribed.

Mentioned in SAL (#wikimedia-operations) [2018-11-08T10:52:29Z] <addshore@deploy1001> Synchronized wmf-config/InitialiseSettings.php: Disable wmgUseTwoColConflict everywhere T209012 T208840 T195724 (duration: 00m 58s)

Stashbot mentioned this in T195724: Adapt Save-, Preview- and Cancel buttons to new version (No. 8).Nov 8 2018, 10:52 AM
Addshore lowered the priority of this task from Unbreak Now! to High.Nov 8 2018, 10:54 AM
Addshore subscribed.

This is no longer UBN as the feature is disabled

thiemowmde mentioned this in rESCC5dddd52fcf45: Fix harmless edits turning into conflicts.Nov 8 2018, 10:54 AM
gerritbot added a comment.Nov 8 2018, 10:55 AM

Change 472411 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[operations/mediawiki-config@master] Revert "Disable wmgUseTwoColConflict everywhere"

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

gerritbot added a comment.Nov 8 2018, 12:23 PM

Change 472175 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@wmf/1.33.0-wmf.3] Fix harmless edits turning into conflicts

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

Stashbot mentioned this in T205942: Some edit submits get fatal InvalidArgumentException "The title does not refer to an existing page" from TwoColConflict extension.Nov 8 2018, 12:29 PM

Mentioned in SAL (#wikimedia-operations) [2018-11-08T12:29:33Z] <zfilipin@deploy1001> Synchronized php-1.33.0-wmf.3/extensions/TwoColConflict: SWAT: [[gerrit:472175|Fix harmless edits turning into conflicts (T205942 T208840 T209012 T209036)]] (duration: 00m 55s)

Stashbot mentioned this in T209036: The title "Foo" does not refer to an existing page.Nov 8 2018, 12:29 PM
gerritbot added a comment.Nov 8 2018, 12:48 PM

Change 472431 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[operations/mediawiki-config@master] Re-enable wmgUseTwoColConflict on group0 only

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

gerritbot added a comment.Nov 8 2018, 12:51 PM

Change 472431 merged by jenkins-bot:
[operations/mediawiki-config@master] Re-enable wmgUseTwoColConflict on group0 only

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

Stashbot added a comment.Nov 8 2018, 12:53 PM

Mentioned in SAL (#wikimedia-operations) [2018-11-08T12:53:22Z] <addshore@deploy1001> Synchronized wmf-config/InitialiseSettings.php: Re-enable wmgUseTwoColConflict on group0 only T205942 T208840 T209012 T209036 (duration: 00m 54s)

gerritbot added a comment.Nov 8 2018, 1:02 PM

Change 472434 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[operations/mediawiki-config@master] Re-enable wmgUseTwoColConflict on dewiki

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

gerritbot added a comment.Nov 8 2018, 1:04 PM

Change 472434 merged by jenkins-bot:
[operations/mediawiki-config@master] Re-enable wmgUseTwoColConflict on dewiki

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

Stashbot added a comment.Nov 8 2018, 1:07 PM

Mentioned in SAL (#wikimedia-operations) [2018-11-08T13:07:46Z] <addshore@deploy1001> Synchronized wmf-config/InitialiseSettings.php: Re-enable wmgUseTwoColConflict on dewiki - T205942 T208840 T209012 T209036 (duration: 00m 53s)

Wargo subscribed.Nov 8 2018, 5:09 PM
gerritbot added a comment.Nov 8 2018, 7:26 PM

Change 472411 merged by jenkins-bot:
[operations/mediawiki-config@master] Revert "Disable wmgUseTwoColConflict everywhere"

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

Stashbot added a comment.Nov 8 2018, 7:35 PM

Mentioned in SAL (#wikimedia-operations) [2018-11-08T19:35:40Z] <thcipriani@deploy1001> Synchronized wmf-config/InitialiseSettings.php: SWAT: [[gerrit:472411|Revert "Disable wmgUseTwoColConflict everywhere"]] T205942 T208840 T209012 T209036 (duration: 00m 54s)

thiemowmde moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2018-11-06 board.Nov 12 2018, 10:22 AM
• Lea_WMDE moved this task from Backlog to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.Nov 12 2018, 10:45 AM
RandomDSdevel awarded a token.Nov 13 2018, 2:35 AM
• Lea_WMDE closed this task as Resolved.Nov 15 2018, 10:25 AM
• Lea_WMDE claimed this task.
• Lea_WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2018-11-06 board.

All reports after the changes were positive :)

WMDE-Fisch added a comment.Nov 15 2018, 10:42 AM
In T208840#4749517, @Lea_WMDE wrote:

All reports after the changes were positive :)

\o/

WMDE-Fisch awarded a token.Nov 15 2018, 10:42 AM
Liuxinyu970226 awarded a token.Nov 19 2018, 1:38 PM
Liuxinyu970226 unsubscribed.
Tobi_WMDE_SW mentioned this in T210591: Create incident report for the get-editconflict-everywhere issue.Nov 28 2018, 9:55 AM
thiemowmde mentioned this in T210758: Add browser test for preview functionality to MediaWiki core.Nov 29 2018, 6:04 PM
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