Maniphest T194736

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

Assigned To

None

Authored By

	daniel
	May 15 2018, 10:20 AM

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
Search...

Status	Subtype	Assigned	Task
Declined		dchen	T118706 Conduct heuristic evaluation of image upload and insert flow in VisualEditor
Open		None	T115858 Design improvements for mw.ForeignStructuredUpload.BookletLayout
Open		None	T115865 Insert image in content immediately after it's uploaded, skipping the "General settings" step
Duplicate		None	T115864 Figure out if the description of the image can be used as the caption on-wiki
Open	Feature	None	T53032 When inserting an image, set its caption by default to be the Commons image description
Open	BUG REPORT	None	T12863 Links on commons upload summaries do not link to commons
Open		None	T5498 Image history is confusing
Stalled		None	T96384 Integrate file revisions with description page history
Open	Feature	None	T39534 Wikimedia Commons should support searching by color
Duplicate		None	T39535 Wikimedia Commons should support filtering by color
Resolved		None	T19503 Provide metadata support on Wikimedia Commons
Open		None	T122038 Moving/Deleting a video file does not move/delete subtitles files, nor does it inform the file mover of their existence
Open		None	T135221 Make TimedText content an integral part of the File page
Open	Feature	None	T2167 Use a dedicated interface for adding meta-data like interwiki links, rather than wikitext
Open		None	T132072 Integrate page meta-data as a new content model revision slot for consistency and atomicity
Resolved		None	T51662 VisualEditor: Use Multimedia/Wikidata's proposed rich structured meta-data in the image insertion dialog
Resolved		None	T68108 [Epic] Store media information for files on Wikimedia Commons as structured data
Open	Feature	None	T14963 allow per-page exceptions to spam blacklist
Open		None	T203157 Make the spam whitelist its own slot
Open	Feature	None	T56140 Move TemplateData to its own JSON-content namespace and associate with Template-namespace, or to its own TemplateData content model and revision slot
Stalled		None	T174043 Deploy Multi-Content Revisions
Open		None	T174022 Implement multi-content revisions
Open		None	T174032 Make relevant API modules aware of MCR
Resolved		daniel	T174025 Implement MCR revision retrieval legacy version
Open		None	T198099 Improve MCR handling of RevisionAccessException family
Resolved		Anomie	T200568 Make API query modules aware of MCR
Resolved		Anomie	T200569 Make ApiComparePages API module aware of MCR
Resolved		Tgr	T194731 Show diffs for all slots [MCR]
Resolved		Tgr	T201842 Use ContentHandler to obtain DifferenceEngine in MobileFrontend
Open		None	T200570 Make ApiEditPage and ApiStashEdit API modules aware of MCR
Open		None	T174033 Refactor EditPage to allow multiple slots to be edited atomically [MCR]
Open		None	T194734 Implement edit conflict resolution for MCR
Open		None	T194736 Implement automatic conflict resolution for all slots [MCR]
Open		None	T200572 Make ApiParse API module aware of MCR
Resolved		daniel	T174035 Allow the view action to show multiple slots [MCR]
Resolved		daniel	T194048 Introduce RevisionRenderer (baseline)
Invalid		Tgr	T194049 Introduce SlotRenderingProvider
Resolved		Anomie	T194263 Deprecate/Remove ContentHandler::makeParserOptions()
Resolved		Anomie	T190712 Wikibase\Repo\Content\EntityHandler should not override makeParserOptions()
Resolved	PRODUCTION ERROR	Func	T206253 Some ApiParse requests fail due to fatal MWException: "not supported for content model"
Open	Feature	Simontaurus	T338099 ApiQuerySiteinfo should provide known and defined slot roles

Event Timeline

daniel triaged this task as Medium priority.May 15 2018, 10:20 AM

daniel created this task.

daniel edited projects, added Multi-Content-Revisions (MCR-SDC Storage Layer - phase 1); removed Multi-Content-Revisions.

daniel added a parent task: T174033: Refactor EditPage to allow multiple slots to be edited atomically [MCR].

daniel added a parent task: T194750: Deploy Structured Data on Commons baseline .May 15 2018, 11:26 AM

daniel updated the task description. (Show Details)May 15 2018, 6:48 PM

CCicalese_WMF moved this task from Inbox to Watching on the MediaWiki-Platform-Team-Archived board.May 19 2018, 9:41 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

CCicalese_WMF removed a parent task: T194750: Deploy Structured Data on Commons baseline .May 31 2018, 2:59 AM

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.

daniel edited projects, added Multi-Content-Revisions; removed Multi-Content-Revisions (MCR-SDC Storage Layer - phase 1), SDC General.Jun 19 2018, 5:31 PM

daniel removed a parent task: T174033: Refactor EditPage to allow multiple slots to be edited atomically [MCR].Jun 19 2018, 5:33 PM

In T194736#4300401, @daniel wrote:

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 removed daniel as the assignee of this task.

• Vvjjkkii raised the priority of this task from Medium to High.