Maniphest T205975

Show highlighted sections if the editor was opened, but nothing changed
Closed, ResolvedPublic2 Estimated Story Points
Actions

Assigned To

Authored By

	• Lea_WMDE
	Oct 2 2018, 1:17 PM

Description

BDD
Given I am on the edit conflict resolution page
When I click on the edit button of the first conflicting paragraph
And I click on the check mark without doing any changes
Then I should still see the highlighted differences between the two versions

Note
This might be the same behavior that should happen when the reset button was pressed

Details

Related Changes in Gerrit:

	Subject	Repo	Branch	Lines +/-
	When no changes are made preserve any highlighted portions	mediawiki/extensions/TwoColConflict	master	+22 -2

Customize query in gerrit

Event Timeline

• Lea_WMDE created this task.Oct 2 2018, 1:17 PM

Restricted Application added a project: TCB-Team (now WMDE-TechWish). · View Herald TranscriptOct 2 2018, 1:17 PM

Restricted Application added a subscriber: Aklapper. · View Herald Transcript

• Lea_WMDE set the point value for this task to 3.Oct 2 2018, 1:18 PM

Andrew-WMDE claimed this task.Dec 11 2019, 10:41 AM

Tobi_WMDE_SW added a project: WMDE-QWERTY-Sprint-2019-12-11.Dec 11 2019, 1:00 PM

Tobi_WMDE_SW changed the point value for this task from 3 to 2.

Tobi_WMDE_SW moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2019-12-11 board.

Change 556412 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@master] When no changes are made preserve any highlighted portions

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

gerritbot added a project: Patch-For-Review.Dec 11 2019, 4:18 PM

Andrew-WMDE moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2019-12-11 board.Dec 12 2019, 9:20 AM

Change 556412 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] When no changes are made preserve any highlighted portions

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

Maintenance_bot removed a project: Patch-For-Review.Dec 12 2019, 12:10 PM

ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.11; 2019-12-17).Dec 12 2019, 1:01 PM

WMDE-Fisch moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2019-12-11 board.Dec 12 2019, 1:45 PM

WMDE-Fisch moved this task from Tickets ready for pickup to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.Dec 12 2019, 2:10 PM