X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-2.0 required=5.0	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_NEUTRAL
X-Spam-Check-By: sourceware.org
Message-ID: <509BAF8C.2060102@cs.utoronto.ca>
Date: Thu, 08 Nov 2012 08:11:40 -0500
From: Ryan Johnson <ryan DOT johnson AT cs DOT utoronto DOT ca>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
Subject: Re: Info for the item "does patch.exe work different than other unx patch tools?" (i.e. "hunk 1 out of 3 hunks failed")
References: <CAGCLmzztLn88uAcD5RzZAyYoPv8mLd0-Kx9gntmbdSObkG44Gg AT mail DOT gmail DOT com>
In-Reply-To: <CAGCLmzztLn88uAcD5RzZAyYoPv8mLd0-Kx9gntmbdSObkG44Gg@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

On 08/11/2012 5:30 AM, Thomas Höhenleitner wrote:
> Hello,
>
> using Cygwin patch.exe in a batch file I ran into the problem that
> patch failed for some reason ("hunk 1 out of 3 hunks failed"):
>
> Investigating this issue I found that inserting "unix2dos my.patch"
> before applying the patch was my friend!
> Being paranoid I tried  "dos2unix my.patch" before applying the patch
> - and it was my friend too!
I've hit problems trying to apply a dos-like patch to a unix-like file, 
and vice-versa, but not what you describe. Also, problems with line 
endings tend to go all-or-nothing: either all hunks fail (all line 
endings differ), or all succeed in the absence of other conflicts.

I almost wonder if the file you edited somehow got inconsistent line 
endings only for the changed lines; that would imply that the two 
successful hunks have only insertions and/or deletions, while the failed 
hunk has actual changes.

Hard to say without seeing the files involved, tho. Also, did you try 
-b/-w with diff, and/or -l with patch?

Ryan


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