Jump to content

Topic on Talk:Release notes/1.23

Patch to previous version (1.23.3) is not working

3
Rob Kam (talkcontribs)
patch -p 1 --dry-run < mediawiki-1.23.4.patch
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: 
Rob Kam (talkcontribs)

The problem is caused by the install being from a tarball while the patch is based on an installation from Git. Files for testing purposes aren't included in the tarball, but patch tries to change one of them, which is why it fails. The upgrade from 1.23.3 to 1.23.4 is successful despite breaking out of it at the error with Ctrl-C. It's only the missing file that gets skipped. See bug 71379

Mglaser (talkcontribs)

We are currently working on this issue. In the future, changes to the tests directory should not be included in the released patches. I made a respective comment in bugzilla. Thanks for finding this.

Reply to "Patch to previous version (1.23.3) is not working"