Forum OpenACS Q&A: Patch - thanks, but help!

Collapse
20: Patch - thanks, but help! (response to 1)
Posted by Lachlan Myers on
Ola,

Thanks - first time I've used patch :/. I tried your suggestion, with result as below.
From my v5.1, I had to get the revision 1.37 of the text procs. I'll do it as a cut and paste, but do you have any suggestions about what I was doing wrong?

$ patch --verbose -p0 <~/patch-src
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: acs-tcl/tcl/text-html-procs.tcl
|===================================================================
|RCS file: /cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
|retrieving revision 1.37
|diff -u -r1.37 text-html-procs.tcl
|--- acs-tcl/tcl/text-html-procs.tcl     20 Apr 2004 21:13:04 -0000      1.37
|+++ acs-tcl/tcl/text-html-procs.tcl     11 May 2004 18:14:51 -0000
--------------------------
Patching file acs-tcl/tcl/text-html-procs.tcl using Plan A...
Hunk #1 FAILED at 702.
1 out of 1 hunk FAILED -- saving rejects to file acs-tcl/tcl/text-html-procs.tcl.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: acs-templating/tcl/data-procs.tcl
|===================================================================
|RCS file: /cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v
|retrieving revision 1.12
|diff -u -r1.12 data-procs.tcl
|--- acs-templating/tcl/data-procs.tcl   11 Dec 2003 21:39:57 -0000      1.12
|+++ acs-templating/tcl/data-procs.tcl   11 May 2004 18:15:47 -0000
--------------------------
Patching file acs-templating/tcl/data-procs.tcl using Plan A...
Hunk #1 FAILED at 110.
1 out of 1 hunk FAILED -- saving rejects to file acs-templating/tcl/data-procs.tcl.rej
done