Page MenuHomePhabricator
Create Task
Maniphest T205841

Conflict simulation preview not choosing sides correctly
Closed, ResolvedPublic5 Estimated Story Points
Actions

Description

I got confused while testing an playing with the empty line handling. - It seems the simulation page does not choose the selected sides correctly

Steps to reproduce:

  • Simulate a change and change something
  • Select your side with your changes
  • Submit simulation preview
  • Your version will not be in the preview

Details

SubjectRepoBranchLines +/-
Fix SpecialPage preview for the new interfacemediawiki/extensions/TwoColConflictmaster+65 -29
Customize query in gerrit

Related Objects

Event Timeline

WMDE-Fisch created this task.Oct 1 2018, 11:29 AM
WMDE-Fisch renamed this task from Conflict simulation preview not showing newlines correctly to Conflict simulation preview not choosing sides correctly.Oct 1 2018, 11:33 AM
WMDE-Fisch updated the task description. (Show Details)

Sorry for turning this task around completely. By another test I just realized what the real problem is. ;-)

• Lea_WMDE set the point value for this task to 5.Oct 2 2018, 12:36 PM

Probably this is related to the self built "preview" of the simulation that might not yet actually react to the new frontend.

• Lea_WMDE moved this task from Backlog to Tickets ready for pickup on the Two-Column-Edit-Conflict-Merge board.Oct 2 2018, 12:38 PM
WMDE-Fisch claimed this task.Oct 4 2018, 1:56 PM
WMDE-Fisch added a project: WMDE-QWERTY-Sprint-2018-09-25.
WMDE-Fisch moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2018-09-25 board.

Adding this to the sprint since the backlog is empty and the only review left hangs on the translate issue.

gerritbot subscribed.Oct 4 2018, 2:01 PM

Change 464571 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Fix SpecialPage preview for the new interface

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

gerritbot added a project: Patch-For-Review.Oct 4 2018, 2:01 PM
WMDE-Fisch moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2018-09-25 board.Oct 4 2018, 2:02 PM
WMDE-Fisch mentioned this in rESCC6c0abb800fa0: Fix SpecialPage preview for the new interface.Oct 4 2018, 2:03 PM
WMDE-Fisch moved this task from Tickets ready for pickup to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.Oct 4 2018, 2:06 PM
gerritbot added a comment.Oct 4 2018, 3:40 PM

Change 464571 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Fix SpecialPage preview for the new interface

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

ReleaseTaggerBot added a project: MW-1.32-notes (WMF-deploy-2018-10-16 (1.32.0-wmf.26)).Oct 4 2018, 4:00 PM
WMDE-Fisch moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2018-09-25 board.Oct 5 2018, 8:28 AM
• Lea_WMDE closed this task as Resolved.Oct 8 2018, 1:54 PM
• Lea_WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2018-09-25 board.
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