Topic on Project:Support desk

Hi, I applied first the patch 1.31.9 on top of the 1.31.8 which worked well and afterwards the 1.31.10 on top of the 1.31.9. The latter didn't work. I get the following message:

checking file includes/ActorMigration.php

checking file includes/Defines.php

checking file includes/user/User.php

Hunk #1 FAILED at 2528.

1 out of 1 hunk FAILED

checking file RELEASE-NOTES-1.31

checking file tests/phpunit/includes/ActorMigrationTest.php

Does anybody have an idea, where I can start to fix this issue?

I discovered, that the filenames last letter of about 180 files seems to be missing in 1.31.10. See here. Let's take ActionMigration.php for example. I do not know from here, if this particular file is affected, but if it is, then the filename is ActorMigration.ph in V1.31.10 and not ActionMigration.php. Maybe this explains your issue?

see also https://lists.wikimedia.org/pipermail/mediawiki-announce/2020-September/000261.html

I have the same issue

phab:T263866

Truncation sounds like phab:T258716

If you're already using the old .9 version, please use https://releases.wikimedia.org/mediawiki/1.31/mediawiki-1.31.10-fixup.patch.gz to get to the proper .10 version

I've re-released the .9 and .10 patches with the whitespace fixes

Thank you Reedy, that worked!

Hi,

first time applying patches instead of just copying the new release on top of the old one.

I get the following message:

$ patch -p1 --dry-run < mediawiki-1.31.10-fixup.patch

checking file includes/ActorMigration.php

checking file includes/api/ApiMain.php

Reversed (or previously applied) patch detected!  Assume -R? [n]

What should i do here?

Thanks