The patch should be diffed against the orginal source. That is the
only way to guarantee it will work. There is never a guarantee that a
patch will apply cleanly to anything other than the source the patch
was diffed against.
On Wed, Dec 06, 2000 at 10:48:27AM -0800, Anmol Khirbat wrote:
> Hi
>
> I imported some source code into a cvs repository, did lots of changes and
> made a Larry Wall patch. The problem is that I cannot apply the patch to a
> copy of the original source cleanly.
>
> When I run patch, I get loads of Hunk FAILEDs and a bunch of .rej files. I
> went through all the reject files and all of them nearly identical. Here's
> one of the rej files with some lines removed.
>
> ***************
> *** 42,48 ****
>
> ! "$Id: errwarn.c,v 1.1.1.1 2000/12/04 22:07:32 anmol Exp $ Copyright (c)
>
> --- 42,48 ----
>
> ! "$Id: errwarn.c,v 1.2 2000/12/06 00:20:08 anmol Exp $ Copyright (c) 1996
>
> Looks like something to do with the $Id$ keyword expansion. Did I goof up
> when I imported the source in the first place? Whats the right way of
> doing things? How can I produce a patch that applies cleanly to a copy of
> the original source?
>
> TIA
>
> bye :)
> Anmol
>
> :wq
>
>
>
>
>
>
> _______________________________________________
> techtalk mailing list
> [EMAIL PROTECTED]
> http://www.linux.org.uk/mailman/listinfo/techtalk
--
Dan Nguyen | It is with true love as it is with ghosts;
[EMAIL PROTECTED] | everyone talks of it, but few have seen it.
[EMAIL PROTECTED] | -Maxime De La Rochefoucauld
_______________________________________________
techtalk mailing list
[EMAIL PROTECTED]
http://www.linux.org.uk/mailman/listinfo/techtalk
