Re: Need help: How to apply diffs generated by `cvs diff'
Martin Buchholz <martin(a)xemacs.org> writes:
I tried to apply Daniel Pittman's patch created by `cvs diff'
to my
workspace using `patch -d /my/workspace'. However, it only patched
the files in the root directory, like configure.in. Files in the
lwlib/ directory couldn't be found by patch, even though the headers
for those files look like:
Index: lwlib/xlwradio.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lwlib/Attic/xlwradio.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xlwradio.h
--- xlwradio.h 1999/07/30 09:13:56 1.1.2.1
+++ xlwradio.h 1999/12/16 09:34:00
The documentation for `patch' indicates that it should look at the
Index: line when patching. So why couldn't it find the file to
patch?
More generally, what is the procedure for applying patches generated
by `cvs diff'?
Try:
POSIXLY_CORRECT=yes patch -d ...
I think that works for RCS/CVS-style diffs. It used to work out of
the box before the FSF people fucked up `patch'. Version 2.1 worked
just fine. :-(