This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Producing CVS diffs
Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de> writes:
> 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?
The patch(1) man page for patch 2.5 says that this patch should apply in
its POSIX compatible mode (i.e.
$ env POSIXLY_CORRECT=y patch < new.diff
Beta versions of `patch' also have the --posix option).
- Hari
--
Raja R Harinath ------------------------------ harinath@cs.umn.edu
"When all else fails, read the instructions." -- Cahn's Axiom
"Our policy is, when in doubt, do the right thing." -- Roy L Ash