Non-JS conflict resolution might ignore reverts in specific cases
Closed, ResolvedPublic1 Estimated Story Points
Actions

Assigned To

Authored By

	WMDE-Fisch
	Mar 4 2020, 9:01 AM

Description

The solution currently proposed in https://gerrit.wikimedia.org/r/574799 to solve T245505: Non-JS error handling when a conflict is submitted with no column selected might lead to unexpected behavior in an edge case where so user sets his edits back to the content of the base revision, does not selected a side and saves. In these cases the conflict resolution will be aborted and nothing will be saved.

Steps to reproduce

with above patch loaded and JS disabled
create a conflict ( e.g. by using your user account and an anonymous tab )
do not select a side
set the text in the "Your revision" column to the text that was written there in the base revision
publish the changes

Expected result
Since no side was selected the algorithm should bring the user back to the conflict resolution form ideally with an error message

Actual result
The conflict resolution is aborted and nothing is saved.

Status	Assigned	Task
Resolved	WMDE-Fisch	T245410 Neither column of a conflict should be selected by default
Stalled	None	T245505 Non-JS error handling when a conflict is submitted with no column selected
Stalled	None	T248573 Allow Non-JS validation by re-populating the form
Resolved	WMDE-Fisch	T246870 Non-JS conflict resolution might ignore reverts in specific cases

Stalled because we have decided to pursue a different approach.

To do here: Check if this is still a problem, and close it if it's not.

I just confirmed that in the Non-JS version the side with the user's edit is pre-selected.

So if the user acts as described and copies the text from base revision to "Your revision" in all conflicting paragraphs and saves the edit - nothing will be saved, since no change was made as should be expected.
If the user copies the text from base revision to "Your revision" only in some conflicting paragraphs and saves the edit - only the changed paragraphs will be saved as expected.

thiemowmde closed this task as Resolved.Nov 3 2020, 1:16 PM