I was wondering how other people tackle this task during a core upgrade.
This is, step 5. Re-apply any modifications to files such as .htaccess or robots.txt.
from Minor version upgrades at https://drupal.org/node/1223018
Files like .htaccess, settings.php and robots.txt can change from one core to another.
But developer modifications must be retained.
So, just running diff and then applying it via patch won't do the job, because changes are necessarily two-way.
How do other people handle this?
* Run diff, edit the diff file, then apply it using patch?
* Manually copy and paste?
* vimdiff ?
* git merge ? ;)
* Something else?
------
Suggestion:
Given
ORIGINAL is the file (.htaccess, settings.php, etc) from the old minor version (eg default.settings.php)
MODIFIED is the modified (by developer) version of ORIGINAL
NEW is the changed (by Drupal Core Team) version of ORIGINAL in the new minor version
This
diff ORIGINAL NEW > DIFF
patch -b MODIFIED DIFFseems to work (in simple cases).
------
Supplementary Question: Apart from .htaccess, settings.php and robots.txt, are there any others that ever need this treatment?