On Fri, 27 Jul 2001, Gilles Detillieux wrote:
> Date: Fri, 27 Jul 2001 16:09:44 -0500 (CDT)
> From: Gilles Detillieux <[EMAIL PROTECTED]>
> To: Joe R. Jah <[EMAIL PROTECTED]>
> Cc: Gilles Detillieux <[EMAIL PROTECTED]>,
"ht://Dig mailing list" <[EMAIL PROTECTED]>
> Subject: Re: [htdig] PATCH: new boolean_keywords patch for 3.1.5
>
> Still odd, because the bool_keywords.1 patch doesn't touch parser.cc.
> Oh well, if it applied to a clean copy, then I can only assume that your
> parser.cc wasn't a clean copy before. But if "patch" fails on a reversal
> and reapplication of a patch that was successfully applied before, it still
> suggests a bug to me.
Ok, got it;) parser.cc.0 was the culprit; I just reversed bool_keywords.2
from my freshly unpacked snapshot; then applied parser.cc.0; then
re-applied bool_keywords.2. I got the exact same failure:
__________________________________________________________________
patch -p0 < ../patch/applied/bool_keywords.2
patching file `htcommon/defaults.cc'
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #1 succeeded at 38 (offset 2 lines).
patching file `htsearch/htsearch.cc'
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #2 succeeded at 233 (offset 32 lines).
Hunk #4 succeeded at 441 (offset 32 lines).
patching file `htsearch/parser.cc'
Reversed (or previously applied) patch detected! Assume -R? [n] y
patching file `htdoc/attrs.html'
Hunk #1 succeeded at 714 (offset 194 lines).
patching file `htdoc/cf_byname.html'
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #1 succeeded at 28 (offset 2 lines).
patching file `htdoc/cf_byprog.html'
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #1 succeeded at 123 with fuzz 2 (offset 4 lines).
__________________________________________________________________
cloud$ patch -p0 < ../patch/applied/parser.cc.0
patching file `./htsearch/parser.cc'
__________________________________________________________________
cloud$ patch -p0 < ../patch/applied/bool_keywords.2
patching file `htcommon/defaults.cc'
Hunk #1 succeeded at 38 (offset 2 lines).
patching file `htsearch/htsearch.cc'
Hunk #2 succeeded at 234 (offset 32 lines).
Hunk #4 succeeded at 450 (offset 32 lines).
patching file `htsearch/parser.cc'
Hunk #1 FAILED at 9.
Hunk #2 succeeded at 39 (offset 2 lines).
Hunk #4 succeeded at 114 (offset 2 lines).
Hunk #6 succeeded at 194 (offset 2 lines).
Hunk #7 succeeded at 432 (offset 4 lines).
1 out of 7 hunks FAILED -- saving rejects to htsearch/parser.cc.rej
patching file `htdoc/attrs.html'
Hunk #1 succeeded at 812 (offset 292 lines).
patching file `htdoc/cf_byname.html'
Hunk #1 succeeded at 28 (offset 2 lines).
patching file `htdoc/cf_byprog.html'
Hunk #1 succeeded at 123 with fuzz 2 (offset 4 lines).
__________________________________________________________________
Regards,
Joe
--
_/ _/_/_/ _/ ____________ __o
_/ _/ _/ _/ ______________ _-\<,_
_/ _/ _/_/_/ _/ _/ ......(_)/ (_)
_/_/ oe _/ _/. _/_/ ah [EMAIL PROTECTED]
_______________________________________________
htdig-general mailing list <[EMAIL PROTECTED]>
To unsubscribe, send a message to <[EMAIL PROTECTED]> with a
subject of unsubscribe
FAQ: http://htdig.sourceforge.net/FAQ.html
