[Linux-disciples] patch(1)

Stephen R Laniel steve at laniels.org
Wed Jun 28 17:42:58 EDT 2006


On Wed, Jun 28, 2006 at 05:26:32PM -0400, Adam Rosi-Kessel wrote:
> Use 'diff -u' for starters.

Ah. That fits nicely into the 'patch -p' business. Cool.

> 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.

diff is good at chunk-matching; I'm not worried about that.

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

diff -u helps here, definitely. Here's the command line I'd
like to use:

diff -u -r /home/slaniel/wordpress/wordpress-2.0.2-{joel,orig} |patch -p1 -b /home/slaniel/wordpress/wordpress-2.0.3-orig/

which would somehow recursively patch the files in
wordpress-2.0.3-orig with the diffs between all the files in
the first two listed directories. But that doesn't work.

I assume there's some well-known way to do this?

-- 
Stephen R. Laniel
steve at laniels.org
Cell: +(617) 308-5571
http://laniels.org/
PGP key: http://laniels.org/slaniel.key
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.bostoncoop.net/pipermail/linux-disciples/attachments/20060628/54b1536e/attachment.pgp


More information about the Linux-disciples mailing list