https://bugzilla.wikimedia.org/show_bug.cgi?id=56184
Web browser: ---
Bug ID: 56184
Summary: Allow 3-way merge from arbitary revisions
Product: MediaWiki
Version: unspecified
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: Unprioritized
Component: Page editing
Assignee: [email protected]
Reporter: [email protected]
Classification: Unclassified
Mobile Platform: ---
This allows the following cool "editprotected" flow:
1. Requester puts the modified version of the requested page somewhere else
(maybe a subpage of talk page).
2. Requester tells admins revision ids of the modified version and the original
revision which the modified one is based on, possibly with a gadget.
3. An admin edits the page with &undoafter=<modified revid>&undo=<original
revid>.
4. If there's a conflict, admins can check &diff=<modified
revid>&oldid=<original revid> and manually apply that, or ask the requester to
submit a new "patch".
Actually existing code can work in this way, and it's only some sanity check
which blocks that. gerrit 91943 is a demonstration of removal of that.
--
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.
_______________________________________________
Wikibugs-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
