Last modified: 2014-10-06 23:07:33 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T73379, the corresponding Phabricator task for complete and up-to-date bug report information.
Bug 71379 - Upgrade patches include changes to files under tests/ even though the tarball does not include these files
Upgrade patches include changes to files under tests/ even though the tarball...
Status: NEW
Product: MediaWiki
Classification: Unclassified
General/Unknown (Other open bugs)
unspecified
All All
: Normal normal (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-09-27 08:53 UTC by Rob Kam
Modified: 2014-10-06 23:07 UTC (History)
3 users (show)

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


Attachments

Description Rob Kam 2014-09-27 08:53:27 UTC
Intention:
Trying to patch mediawiki 1.23.3 to mediawiki-1.23.4.patch.

Steps to Reproduce:
patch -p 1 --dry-run < mediawiki-1.23.4.patch


Actual Results:  
patching file includes/config/GlobalVarConfig.php
patching file includes/db/DatabaseMysqli.php
patching file includes/DefaultSettings.php
patching file includes/libs/XmlTypeCheck.php
patching file includes/Sanitizer.php
patching file includes/upload/UploadBase.php
patching file RELEASE-NOTES-1.23
can't find file to patch at input line 387
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nruw -x messages -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -                               x '*.tiff' -x '*.zip' -x '*.xmp' -x '.git*' mediawiki-1.23.3/tests/phpunit/inclu                               des/upload/UploadBaseTest.php mediawiki-1.23.4/tests/phpunit/includes/upload/Upl                               oadBaseTest.php
|--- mediawiki-1.23.3/tests/phpunit/includes/upload/UploadBaseTest.php  2014-09-                               24 19:58:10.961599096 +0000
|+++ mediawiki-1.23.4/tests/phpunit/includes/upload/UploadBaseTest.php  2014-09-                               24 19:55:15.538575503 +0000
--------------------------
File to patch: 


Reproducible: Always

So I ran it anyway and wiki now is version 1.23.4 - it seems to be only the non-existent UploadBaseTest.php that has not been patched. Is this right/there nothing to worry about?
Comment 1 Jackmcbarn 2014-09-27 16:07:50 UTC
Confirmed.
Comment 2 Jackmcbarn 2014-09-27 16:16:53 UTC
The problem is that you installed 1.23.3 from a tarball, but the patch is based on an installation from Git. Files for testing purposes aren't included in the tarball, but the patch tried to change one of them, which is why it couldn't find it. Your upgrade was successful even though you skipped that file.
Comment 3 Rob Kam 2014-09-27 18:56:14 UTC
Thanks.
Comment 4 Markus Glaser 2014-10-06 23:07:33 UTC
We are currently working on this issue. Added hexmode in CC.

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


Navigation
Links