Project

General

Profile

Actions
Copy link

Feature #2876

open

A simple plan for wiki concurrent edition

Added by Paul Rivier over 15 years ago. Updated over 15 years ago.

Status:
New
Priority:
Normal
Assignee:
Jean-Philippe Lang
Category:
Wiki
Target version:
-
Start date:
2009-03-02
Due date:
% Done:

0%

Estimated time:
Resolution:

Description

Wiki concurrent edition does not happen very often, but when it does, user can loose its work easily. Current feature is to prevent saving when page has been touched in the meantime. What I propose is to merge changes the way diff3 works and if needed, leave conflict markers in the document and warn the users that a conflicting merge has been done. This has the benefit of:
  • saving the user work when (s)he press the save button in any case ;
  • merge non conflicting cases automatically ;
  • allow an other user (more experienced) to manually handle conflicting regions later.

What do you think ?

Files

wiki_concurrent_edition.patch (6.3 KB) wiki_concurrent_edition.patch Wiki concurrent edition patch Pierre Paysant-Le Roux, 2009-06-30 20:24
Actions
Copy link
 #1

Updated by Greg Burri over 15 years ago

Great feature ! +1

Actions
Copy link
 #2

Updated by Pierre Paysant-Le Roux over 15 years ago

Hi,

here is a patch that does the job. It uses GNU diff3 (as Mediawiki).

Actions
Copy link
 #3

Updated by Paul Rivier over 15 years ago

  • Assignee set to Jean-Philippe Lang

Hi Jean-Philippe,
You may want to review this patch. Wiki concurrent edition will fail over nicely to current behaviour if diff3 is not available on site.

Actions
Copy link

Also available in: Atom PDF