Re: Where is patch?

[René Berber <r dot berber at computer dot org>]

Dave Korn wrote:
[snip]
>   And I imagine both of you have testcases available to prove your respective
> claims..... ?  

Test case attached.

The files are part of mailman, I just included a shortened patch file and the
file to be patched.  The test procedure (with the output I get):

$ mkdir patch-testcase
$ cd patch-testcase/
# [copy both files here]
$ ls
copyof-mailman-2.1.6.tar.bz2  indexing-2.1.6-0.1.patch
$ tar xvf copyof-mailman-2.1.6.tar.bz2
mailman-2.1.6/
mailman-2.1.6/templates/
mailman-2.1.6/templates/da/
mailman-2.1.6/templates/da/archidxfoot.html

$ patch --version
patch 2.5.8
...
$ cd mailman-2.1.6/
$ patch -p1 < ../indexing-2.1.6-0.1.patch
patching file templates/da/archidxfoot.html
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 18.
2 out of 2 hunks FAILED -- saving rejects to file templates/da/archidxfoot.html.rej
$ cd ..
$ rm -rf mailman-2.1.6/
$ tar xvf copyof-mailman-2.1.6.tar.bz2
...

$ cd mailman-2.1.6/
$ /usr/local/bin/patch --version
patch 2.5.4
...
$ /usr/local/bin/patch -p1 < ../indexing-2.1.6-0.1.patch
patching file templates/da/archidxfoot.html
---
René Berber

Attachment: copyof-mailman-2.1.6.tar.bz2
Description: Binary data

diff -ruP --exclude=.DS_Store mailman-2.1.6/templates/da/archidxfoot.html mailman-2.1.6-index/templates/da/archidxfoot.html
--- mailman-2.1.6/templates/da/archidxfoot.html	Fri Nov 12 00:09:47 2004
+++ mailman-2.1.6-index/templates/da/archidxfoot.html	Thu Jun  9 14:23:52 2005
@@ -1,4 +1,5 @@
     </ul>
+%(indexing_disable)s
     <p>
       <a name="end"><b>Dato for nyeste meddelelse:</b></a>
        <i>%(lastdate)s</i><br>
@@ -17,5 +18,6 @@
      <hr>
      <i>Dette arkiv blev genereret af
      Pipermail %(version)s.</i>
+%(indexing_enable)s
   </BODY>
 </HTML>

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/