[Linux-disciples] patch(1)

[Adam Rosi-Kessel]

Stephen R Laniel wrote:
> Scenario:
> 
> 1) We're running a hacked version of WordPress 2.0.2.
> 2) We want to upgrade to 2.0.3, then apply the patches.
> 3) So my approach is to diff the 2.0.2 and patched 2.0.2
>    files, then apply those diffs -- via patch(1) -- to the
>    (unpatched) 2.0.3.
> 
> My experience with patch is limited -- i.e., I just started
> using it yesterday. I wrote some shell-scripty weirdness to
> make this happen. Is there any easy way, using just patch
> and diff, to do it?

Use 'diff -u' for starters.

If the line numbers don't match up between 2.0.2 and 2.0.3, which they
presumably won't, you'll have to tweak your diff files.

It's not clear exactly what obstacle you're hitting, though. The gnu diff
manpage/info page is quite comprehensive.