https://bugzilla.wikimedia.org/show_bug.cgi?id=56849

--- Comment #2 from Adam Wight <s...@ludd.net> ---
The solution should go beyond the above patch.  Ideally, we remove the cheesy
timestamp check and rely entirely on an atomic update attempt.  If that fails
due to a conflict, perhaps WikiPage::doEditContent falls back to 3-way merge
(moving that code down from EditPage), and then we attempt a second, atomic
update.

-- 
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
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l

Reply via email to