Hello!
I administer a few MediaWiki-installations. They are hosted on different (Webspace)-Server, and have different versions: 1.5x, 1.6x and 1.8x.
When we make in one article two section-edits, we got an edit-conflict, although we edited in different sections. I could reproduce the conflict this in all my wikis ... but my test in the de.wikipedia causes no edit-conflict.
How to configurate a MediaWiki-Installation to avoid this?
Thanks, Jan
Hello again!
Has nobody an idea? Also see my fullquoted question below. Could somesone of you try this in your own wiki-install?
# User FF (or Browser FF) opens article Sandbox and click edits ==section one== # User IE opens Sandbox, clicks edits == section two ==, changed something, and choose SAVE # User FF saves this changes in previous opened "edit section one".
Do you get an edit conflict, too?
I hope for your help, regards, Jan
Jan Fokko schrieb:
Hello!
I administer a few MediaWiki-installations. They are hosted on different (Webspace)-Server, and have different versions: 1.5x, 1.6x and 1.8x.
When we make in one article two section-edits, we got an edit-conflict, although we edited in different sections. I could reproduce the conflict this in all my wikis ... but my test in the de.wikipedia causes no edit-conflict.
How to configurate a MediaWiki-Installation to avoid this?
Thanks, Jan
MediaWiki-l mailing list MediaWiki-l@Wikimedia.org http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
On 10/23/06, Jan 2036@gmx.de wrote:
Hello again!
Has nobody an idea? Also see my fullquoted question below. Could somesone of you try this in your own wiki-install?
# User FF (or Browser FF) opens article Sandbox and click edits ==section one== # User IE opens Sandbox, clicks edits == section two ==, changed something, and choose SAVE # User FF saves this changes in previous opened "edit section one".
Do you get an edit conflict, too?
I hope for your help, regards, Jan
Jan Fokko schrieb:
Hello!
I administer a few MediaWiki-installations. They are hosted on different (Webspace)-Server, and have different versions: 1.5x, 1.6x and 1.8x.
When we make in one article two section-edits, we got an edit-conflict,
although
we edited in different sections.I could reproduce the conflict this in all my wikis ... but my test in
the
de.wikipedia causes no edit-conflict.
How to configurate a MediaWiki-Installation to avoid this?
Thanks, Jan
MediaWiki-l mailing list MediaWiki-l@Wikimedia.org http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
MediaWiki-l mailing list MediaWiki-l@Wikimedia.org http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
That behavior is what I see on en.wikipedia and the two MediaWiki 1.7.1installations I have run elsewhere.
It would be nice if it did the equivalent of a source code merge on the second edit to be completed, if it didn't overlap then insert it appropriately, but it seems to lock the whole article when you edit one section.
The only way around this is to make sections transcluded from subpages, rather than normal inline sections, I think. Then the edits only conflict if people are editing the same transcluded subpage.
Thanks for your reply.
I tested this in en.wikipedia (see here: http://en.wikipedia.org/w/index.php?title=Wikipedia:Sandbox&oldid=832643... )
I could cause a edit-conflict while editing two different sections.
Only in my own MediaWiki-Installs I could find this behavior :(
For hints to configure my wikis like WP-Servers I would be grateful.
Regards, Jan
Fokko wrote:
I administer a few MediaWiki-installations. They are hosted on different (Webspace)-Server, and have different versions: 1.5x, 1.6x and 1.8x.
When we make in one article two section-edits, we got an edit-conflict, although we edited in different sections.
MediaWiki does conflict merging using the external utility diff3. This is usually preinstalled standard on Linux and many Unix systems, and is auto-detected.
Ensure that GNU diff3 is in fact present on the system, and make sure $wgDiff3 is set to the complete path to the diff3 executable like so:
$wgDiff3 = "/usr/bin/diff3";
If you're running on Windows this might look something like:
$wgDiff3 = "C:\Program Files\cygwin\bin\diff3.exe";
Note that Solaris has a slightly funny diff3; I think there's a check for it in the installer which either disables it or uses an alternate GNU version that's present, I forget which.
-- brion vibber (brion @ pobox.com)
mediawiki-l@lists.wikimedia.org