Page MenuHomePhabricator

Implement automatic conflict resolution for all slots [MCR]
Open, NormalPublic

Description

Generalize the the conflict resolution mechanism currently currently implemented by EditPage to work with multiple slots. The 3-way-merge should be applied to each slot separately, using ContentHandler::merge3(). Automatic conflict resolution fails of one of the merges fails.

To satisfy this ticket, it is acceptable to reject edits that change slots other than the main slot if automatic conflict resolution fails. Eventually though, automatic conflict resolution as well as user mediated interactive resolution should be implemented for edits that span multiple slots.

Related Objects

StatusAssignedTask
Declineddchen
OpenNone
OpenNone
DuplicateNone
OpenNone
ResolvedAbit
OpenNone
OpenNone
OpenNone
DuplicateNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
Resolvedppelberg
ResolvedKrinkle
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenAnomie
Resolveddaniel
Opendaniel
ResolvedAnomie
ResolvedAnomie
ResolvedTgr
ResolvedTgr
OpenAnomie
OpenNone
OpenNone
Opendaniel
OpenAnomie
Resolveddaniel
Resolveddaniel
InvalidTgr
ResolvedAnomie
ResolvedAnomie
OpenNone

Event Timeline

daniel updated the task description. (Show Details)May 15 2018, 6:48 PM
CCicalese_WMF renamed this task from Implement automatic conflic resolution for all slots [MCR] to Implement automatic conflict resolution for all slots [MCR].May 30 2018, 9:25 PM
daniel claimed this task.Jun 19 2018, 5:22 PM

I just realized that this ticket is moot as long as EditPage can only edit the main slot. As long as this is the case, conflicts can only affect the main slot, and merging the main slot is sufficient. So this is really part of the T174033: Refactor EditPage to allow multiple slots to be edited atomically [MCR] epic.

Anomie added a subscriber: Anomie.Jun 20 2018, 12:36 PM

I just realized that this ticket is moot as long as EditPage can only edit the main slot.

ApiEditPage too.

I'd say both upating EditPage for editing multiple slots and updating ApiEditPage for editing multiple slots are blocked on someone implementing what we've been calling EditController, part of which is this task. But ApiEditPage isn't also potentially blocked on UI issues.

Vvjjkkii renamed this task from Implement automatic conflict resolution for all slots [MCR] to zxcaaaaaaa.Jul 1 2018, 1:09 AM
Vvjjkkii raised the priority of this task from Normal to High.
Vvjjkkii removed daniel as the assignee of this task.
Vvjjkkii updated the task description. (Show Details)
Vvjjkkii removed a subscriber: Aklapper.
CommunityTechBot assigned this task to daniel.
CommunityTechBot lowered the priority of this task from High to Normal.
CommunityTechBot renamed this task from zxcaaaaaaa to Implement automatic conflict resolution for all slots [MCR].
CommunityTechBot added a subscriber: Aklapper.