Note that the “diff file” method did not work out for me: some patches were applied in a bad manner (“offset of xxx lines detected” etc., in effect appending it to the file …) and so for example the Magento Connect manager did not work any more because its PHP source got mangled. Therefore, I cannot recommend updating by patching. Instead, follow another one of the Magento upgrading methods. If you download and install a full new version, this will of course force you to re-apply your local changes to Magento code.
However, if you still want to try the diff file method:
- Download the diff files you need from magentocommerce.com/download/diff
- Clear the cache:
rm -rf var/cache/*
- Decompress the diff ball to your magento root.
- Use the following patch command to apply the diff patches:
patch -p0 -f < 18.104.22.168-22.214.171.124.diff
-fswitch means “force”, which will not ask you if you think the patch is “reversed” (created with the parameters of diff erroneously swapped). Magento patches are never reversed …