The two-column edit conflict tool has produced this bugous edit:
Here, things like <, > or & has been replaced by the corresponding HTML-entities.
All text that I have entered (and accepted in EC resolution) is fine.
Text that has been entered by the other user (and which I have accepted in EC resolution) is not fine.
The unchanged text is not fine.
See also: https://www.mediawiki.org/wiki/Topic:Vk8kt6ajyfkwhi79
I was asked by @alanajjar to create a task about this issue:
Some examples:
22:58 <Alaa|away> https://ar.wikipedia.org/wiki/%D8%AE%D8%A7%D8%B5:%D9%81%D8%B1%D9%82/45795599 23:06 <Alaa|away> examples about two cloumn issue: 23:06 <Alaa|away> https://ar.wikipedia.org/w/index.php?diff=45787845 23:13 <Alaa|away> please cc me, + you can put that a lot of arwiki users complain here https://ar.wikipedia.org/w/index.php?title=%D9%86%D9%82%D8%A7%D8%B4_%D8%A7%D9%84%D9%85%D8%B3%D8%AA%D8%AE%D8%AF%D9%85:%D8%B9%D9%84%D8%A7%D8%A1&oldid=45796945#%D9%85%D8%B1%D8%AD%D8%A8%D8%A7 23:15 <Alaa|away> another example https://ar.wikipedia.org/w/index.php?title=%D8%A7%D9%83%D8%AA%D8%A6%D8%A7%D8%A8_%28%D8%AD%D8%A7%D9%84%D8%A9_%D9%86%D9%81%D8%B3%D9%8A%D8%A9%29&type=revision&diff=45791829&oldid=45791724
Boldly triaging to High, as this renders this functionality useless.
It may be annoying, but this is a "beta" feature and by definition one should not expect it to behave like other stable features. Anyone can easily disable it from their preferences. I actually find solving edit conflict more easier without it.
Change 588370 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Fix double HTML escaping of "copytext" lines in the diff
@Ammarpad: I agree that the beta feature may have some flaws.
However: It was turned on automagically when introduced in my account. And it seems¹ that it was introduced for all users having global settings for there accounts. So currently 53.025 Users in engl. Wikipedia are "testing".
So maybe someone should take a look at global settings and the default values for beta features.
¹) Some other account (used for some tool) where I have never done any change with the settings and where I do not have global settings has not turned it on.
Thanks a lot for creating this ticket! This is really helpful for the team currently working on the Two-Column-Edit-Conflict-Merge code.
@Wurgl, Beta features only get enabled when you decide to do so, either by enabling them one by one, or by checking "Automatically enable all new beta features". Unfortunately this is very much unrelated to this bug report. @Ammarpad, please help keeping discussions here on Phabricator focused on one issue per ticket.
Change 588370 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Fix double HTML escaping of "copytext" lines in the diff
Change 588401 had a related patch set uploaded (by Awight; owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@wmf/1.35.0-wmf.27] Fix double HTML escaping of "copytext" lines in the diff
@thiemowmde: I have NOT turned on the "Automatically enable all new beta features", I have NOT turned on any beta feature.
Hi @Wurgl, in case I can help clarify, TwoColConflict became the default conflict resolution workflow for Arabic, Farsi, and German wikipedias (as well as "group 0" wikis) since T244863: Deploy Two-Column Edit Conflict as the default workflow for a small set of wikis. If you want to discuss anything related to the choice of default workflow, beta preferences, and so on, please do so on that ticket and not here. This task is about a specific HTML escaping issue and other topics will not get the attention they deserve.
Change 588401 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@wmf/1.35.0-wmf.27] Fix double HTML escaping of "copytext" lines in the diff
Mentioned in SAL (#wikimedia-operations) [2020-04-13T18:49:13Z] <niedzielski@deploy1001> Synchronized php-1.35.0-wmf.27/extensions/TwoColConflict: SWAT: [[gerrit:588370|Fix double HTML escaping of "copytext" lines in the diff (T249986)]] (duration: 01m 01s)
Change 588652 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Make browser tests cover HTML escaping better
Change 588652 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Make browser tests cover HTML escaping better