Last modified: 2010-05-15 15:33:18 UTC

Wikimedia Bugzilla is closed!

Wikimedia has migrated from Bugzilla to Phabricator. Bug reports should be created and updated in Wikimedia Phabricator instead. Please create an account in Phabricator and add your Bugzilla email address to it.
Wikimedia Bugzilla is read-only. If you try to edit or create any bug report in Bugzilla you will be shown an intentional error message.
In order to access the Phabricator task corresponding to a Bugzilla report, just remove "static-" from its URL.
You could still run searches in Bugzilla or access your list of votes but bug reports will obviously not be up-to-date in Bugzilla.
Bug 2771 - Feature Request: Parallel Section Edit with Transparent Merge
Feature Request: Parallel Section Edit with Transparent Merge
Status: RESOLVED WORKSFORME
Product: MediaWiki
Classification: Unclassified
Interface (Other open bugs)
1.4.x
PC Windows XP
: Normal enhancement (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2005-07-09 14:11 UTC by Andrei Pozolotin
Modified: 2010-05-15 15:33 UTC (History)
0 users

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---


Attachments

Description Andrei Pozolotin 2005-07-09 14:11:27 UTC
Hello, Everybody:

1) PERCEIVED PROBLEM:

Currently, when two or more people edit different sections
of the same page and "at the same time", on save, they are presented with 
counterintuitive "compare whole page" message.

2) PROPOSED SOLUTION:

A) In situations when people in fact edit DIFFERENT sections
do transparent (and silent) merge on save.

B) In situations when people edited SAME ONE section in parallel,
on save, present them with "compare & merge 2 versions of same section" option.

C) If something more complex happens,
present them with "compare & merge 2 versions of whole page".

3) PROBABLE ALGORITHM:

A) When section-being-edited is sent to client for edit,
parse parent page for distinctions of all sections
and create MD5 hashes for all sections content;
Store this original-MD5-hash-table in session variables.

B) When client saves section-being-edited:
- reload parent page from DB;
- parse all sections, create current-MD5-hash-table;
- find in "current" table matching "original" MD5 content signature for
section-being-edited;
- if section-being-edited match found: then replace found section with
section-being-edited new content - do "silent merge";
- if section-being-edited match not found, and there is a per-section page-deep
sections matching pattern like this: 
    {beginning sections match} {one section mismatch in the middle} {finishing
sections match}: 
    then give user with an option "compare & merge 2 versions of same section" -
do "expected merge";
- if section-being-edited match not found, and special match pattern above is
not present: 
    then give an option "compare & merge 2 versions of whole document" - do
"worst case merge";
Comment 1 Brion Vibber 2005-07-09 18:36:14 UTC
When you edit different sections, automatic merge should already happen without conflicts.
Comment 2 Yan Valuyskiy 2005-07-13 15:50:08 UTC
(In reply to comment #1)
> When you edit different sections, automatic merge should already happen without conflicts.

Feature was tested on 1.4.6 release with default settings, and there is still conflics suitable.
Please could you give some editional information about implementation or setting up.

Thanks.
Comment 3 Antoine "hashar" Musso (WMF) 2005-07-13 15:55:06 UTC
Conflict merge is already in MediaWiki. The merge conflict window
is open when people add sections and when there is a conflict that
can't be automaticly resolved (like two people editing the same
section).

Two people adding basic text in different sections will not get the
conflict merging window.

Note You need to log in before you can comment on or make changes to this bug.


Navigation
Links