Subject: patch failing

From: "Bridget Nichols" <[email-masked]>
Date: Thu, 12 Oct 2000 10:41:24 +0100

I reduced the command line patch to the first hunk (removing the diff -rc line) as follows:

*** pine4.21/pico/pico.c  Thu Jun 10 15:56:16 1999 
--- pine4.21.outgoing/pico/pico.c Thu Feb 24 02:29:09 2000      ***************
 *** 133,138 **** 
 ---- 133,143 ---- 
       pico_all_done = 0;
       km_popped     = 0;                                                                                                                    

+     if (pm->auto_cmds){ 
+ #define CTRL_X 24 
+     if ((pm->auto_cmds[0] == CTRL_X) && (pm->auto_cmds[1] == 'y')){
+       return (1);}} 
+   
      if(!vtinit())                     /* Init Displays.      */
           return(COMP_CANCEL);
P_CANCEL); 

My understanding is that this should insert those lines starting with a "+" into .../pine4.21.outgoing/pico/pico.c

My output reads as follows:

Processing...  Looks like a context diff... 
The text leading up to this was:
 -------------------------- 
|*** pine4.21/pico/pico.c     Thu Jun 10 15:56:16 1999
|--- pine4.21.outgoing/pico/pico.c    Thu Feb 24 02:29:09 2000    -------------------------- 
Patching file pine4.21/pico/pico.c using Plan A...                  patch: 3016-030 (This is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate  the new style...)
Hunk #1 failed at 133.
1 out of 1 hunks failed--saving rejects to pine4.21/pico/pico.c.rej
done                                                                

**********************************************************************
This email and any files transmitted with it are confidential and 
intended solely for the use of the individual or entity to whom they   
are addressed. If you have received this email in error please notify 
your email system administrator.

This footnote also confirms that this email message has been checked
for the presence of computer viruses.
**********************************************************************
-- 
-----------------------------------------------------------------
 For information about this mailing list, and its archives, see: 
 http://www.washington.edu/pine/pine-info/
-----------------------------------------------------------------