From: Daniel Stenberg <daniel_at_haxx.se>
Date: Thu, 29 Aug 2002 07:54:46 +0200 (MET DST)

On Wed, 28 Aug 2002, Chad wrote:

> Could someone please let me know if there is an easy way to insert the diff
> file code I have made. I would like to apply my changes to new daily builds
> without having to manually find and move things. I have read the mighty FAQ
> but found nothing, if there is an article a link would be great.

The (GUN) 'patch' program! It used like this:

$ cd rockbox-root
$ patch < magic.patch

Sometimes, the diff has path info you want to strip so that patch can find
your file names. -p then takes off a number of "path parts" from left:

$ patch -p0 < magic.patch

or

$ patch -p1 < magic.patch

If patch can't apply some changes that are in the diff, you'll get those
particular changes in a file named "[source-file].rej".

And I agree, we could put up some docs on the site on how to use diff and
patch. Might help people get to work faster!

-- 
Daniel "Bagder" Stenberg -- http://rockbox.haxx.se/

Received on 2002-08-29