Subject: Re: patch to fix bug 1207
From: Matti Picus (matti@picus.org)
Date: Thu Sep 13 2001 - 09:03:39 CDT
Geez, things are changing fast! I did the patch yesterday against 1.96 and
in the mean time someone else changed the file, which as Martin's patch
(sent today) showed, is now 1.97. I will try again, hopefully before
someone else changes something.
BTW, I am not a patch expert, but after reading 'man patch' I do not
understand what went wrong. I used 'cvs diff -c' to create the patch, as
can be seen in the first lines of the patch:
------------------------------
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.cpp,v
retrieving revision 1.96
diff -c -r1.96 ie_imp_RTF.cpp
*** ie_imp_RTF.cpp 2001/09/12 04:02:08 1.96
--- ie_imp_RTF.cpp 2001/09/12 07:16:15
-----------------------------------------------
The man page says that patch should try to find the proper lines, even if
the numbers are not quite right. Or is 'patch -c' mandatory in this case?
Matti
"Stumbling, bumbling, the job will get done"
Matti
At 02:36 PM 13/9/2001 +0200, Hubert Figuiere wrote:
>I'm sorry, but I get that:
>
>$zcat /tmp/bug1207.patch.gz |patch -p0
>patching file ie_imp_RTF.cpp'
>Hunk #1 FAILED at 3114.
>Hunk #2 FAILED at 4613.
>Hunk #3 FAILED at 4656.
>Hunk #4 FAILED at 4669.
>Hunk #5 FAILED at 4697.
>Hunk #6 FAILED at 5577.
>Hunk #7 FAILED at 5789.
>7 out of 7 hunks FAILED -- saving rejects to ie_imp_RTF.cpp.re
>$
>
>In short, your patch gets rejected. :-(
>I'll try to apply it by hand... unless you can redo it against CVS.
>
>Thanks
>
>Hub
This archive was generated by hypermail 2b25 : Thu Sep 13 2001 - 08:04:29 CDT