Thread:Project:Support desk/Upgrading to 1.24.2 using patch

I am getting a bunch of errors related to files in a "tests" directory and a non-existent file ('Gruntfile.js'). I have encountered something like this before when upgrading.

My personal wishlist is that the references to the test files are cleaned-up in future patches -- so that one gets a clean patch application without ignored hunks.

Here is what the patch application looks like on a test system I am running: patching file Gruntfile.js patching file includes/api/ApiFormatWddx.php patching file includes/DefaultSettings.php patching file includes/EditPage.php patching file includes/Html.php patching file includes/installer/PostgresUpdater.php patching file includes/libs/XmlTypeCheck.php patching file includes/media/BitmapMetadataHandler.php patching file includes/media/JpegMetadataExtractor.php patching file includes/media/XMP.php patching file includes/OutputPage.php patching file includes/specialpage/SpecialPageFactory.php patching file includes/specials/SpecialActiveusers.php patching file includes/specials/SpecialJavaScriptTest.php patching file includes/specials/SpecialUserlogin.php patching file includes/upload/UploadBase.php patching file includes/User.php patching file includes/Xml.php patching file jsduck.json patching file languages/i18n/en.json patching file languages/i18n/qqq.json patching file maintenance/jsduck/config.json patching file maintenance/mwjsduck-gen patching file maintenance/postgres/tables.sql patching file RELEASE-NOTES-1.24 patching file resources/lib/jquery/jquery.js patching file resources/Resources.php patching file resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js The next patch would delete the file tests/frontend/Gruntfile.js, which does not exist! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 2217 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored patching file tests/phpunit/data/xmp/doctype-included.result.php can't find file to patch at input line 2245 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 2310 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 2321 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 5 out of 5 hunks ignored can't find file to patch at input line 2403 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 2438 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 2472 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 2510 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 2525 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 2565 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- -- File to patch: Skip this patch? [y] Skipping patch. 7 out of 7 hunks ignored
 * 1) patch -p1 < mediawiki-1.24.2.patch
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/parser/parserTests.txt mediawiki-1.24.2/tests/parser/parserTests.txt
 * --- mediawiki-1.24.1/tests/parser/parserTests.txt	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/parser/parserTests.txt	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/phpunit/includes/media/XMPTest.php mediawiki-1.24.2/tests/phpunit/includes/media/XMPTest.php
 * --- mediawiki-1.24.1/tests/phpunit/includes/media/XMPTest.php	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/phpunit/includes/media/XMPTest.php	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php mediawiki-1.24.2/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
 * --- mediawiki-1.24.1/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/phpunit/includes/upload/UploadBaseTest.php mediawiki-1.24.2/tests/phpunit/includes/upload/UploadBaseTest.php
 * --- mediawiki-1.24.1/tests/phpunit/includes/upload/UploadBaseTest.php	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/phpunit/includes/upload/UploadBaseTest.php	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/phpunit/includes/UserTest.php mediawiki-1.24.2/tests/phpunit/includes/UserTest.php
 * --- mediawiki-1.24.1/tests/phpunit/includes/UserTest.php	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/phpunit/includes/UserTest.php	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/phpunit/includes/XmlTypeCheckTest.php mediawiki-1.24.2/tests/phpunit/includes/XmlTypeCheckTest.php
 * --- mediawiki-1.24.1/tests/phpunit/includes/XmlTypeCheckTest.php	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/phpunit/includes/XmlTypeCheckTest.php	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/qunit/data/testrunner.js mediawiki-1.24.2/tests/qunit/data/testrunner.js
 * --- mediawiki-1.24.1/tests/qunit/data/testrunner.js	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/qunit/data/testrunner.js	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/qunit/QUnitTestResources.php mediawiki-1.24.2/tests/qunit/QUnitTestResources.php
 * --- mediawiki-1.24.1/tests/qunit/QUnitTestResources.php	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/qunit/QUnitTestResources.php	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js mediawiki-1.24.2/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
 * --- mediawiki-1.24.1/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js	2015-03-31 18:45:35.000000000 +0000
 * diff -Nruw -x '*~' -x '.js*' -x '.git*' -x '*.xcf' -x '#*#' -x '.#*' -x '.rubocop*' -x .travis.yml -x package.json -x messages -x Gemfile -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' mediawiki-1.24.1/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js mediawiki-1.24.2/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
 * --- mediawiki-1.24.1/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js	2015-03-31 18:45:59.000000000 +0000
 * +++ mediawiki-1.24.2/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js	2015-03-31 18:45:35.000000000 +0000

System:
 * Debian Linux - Stable
 * MediaWiki 1.24.1
 * MySQL: 5.5.33-0+wheezy1
 * PHP: 5.4.4-14+deb7u14 (apache2handler)
 * Lua: 5.1.5