This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Producing CVS diffs


How can I produce diffs against the CVS tree that work well with patch?
When I do 'cvs -z9 diff -u' in the gcc directory, I get headers that
look like

Index: cp/tree.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/tree.c,v
retrieving revision 1.25
diff -u -p -r1.25 tree.c
--- tree.c	1998/03/12 00:29:16	1.25
+++ tree.c	1998/03/17 20:57:57

Now, when applying those in the gcc directory with patch 2.5,
patch thinks this is against tree.c, not cp/tree.c, and fails.
How can I get it to accept this patch, or how can I produce a
patch that it will accept?

Martin


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]