Last modified: 2011-04-04 21:28:27 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 3809 - On edit conflict, if diff3 fails, an empty article is committed.
On edit conflict, if diff3 fails, an empty article is committed.
Status: RESOLVED FIXED
Product: MediaWiki
Classification: Unclassified
History/Diffs (Other open bugs)
1.5.x
Other Solaris
: Normal normal (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2005-10-27 13:16 UTC by Dossy Shiobara
Modified: 2011-04-04 21:28 UTC (History)
1 user (show)

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


Attachments

Description Dossy Shiobara 2005-10-27 13:16:18 UTC
I've been seeing sporadic occurrences of a strange bug: on submitting an edit,
the entire article body is truncated.

I think I've finally figured out what is causing this.  This seems to happen
when there's an editing conflict, and diff3 is invoked.  There's no errors in
the PHP log, but I see this in the Apache error log:

diff: illegal option -- a
usage: diff [-bitw] [-c | -e | -f | -h | -n] file1 file2
       diff [-bitw] [-C number] file1 file2
       diff [-bitw] [-D string] file1 file2
       diff [-bitw] [-c | -e | -f | -h | -n] [-l] [-r] [-s] [-S name] directory1
directory2
/path/to/diff3: subsidiary program `diff' failed

This seems to be a PATH error -- GNU diff is installed in /path/to/diff, but the
system (Solaris 5.8) has a diff in /usr/bin/diff, which seems to be getting
invoked by diff3.

Clearly this is a "configuration error" but MediaWiki should detect the failure
of diff3 and either reject the edit because it can't merge OR do something
otherwise intelligent rather than truncating the article text and committing it.
Comment 1 Brion Vibber 2005-10-27 23:06:04 UTC
This was already fixed on the head branch; I've copied it into REL1_5 and it should 
appear in 1.5.2.

The change you want is:
http://cvs.sourceforge.net/viewcvs.py/wikipedia/phase3/includes/GlobalFunctions.php?
r1=1.206&r2=1.207&diff_format=u

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


Navigation
Links