X-Recipient:	archive-cygwin AT delorie DOT com
DomainKey-Signature:	a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:message-id:date:from:mime-version:to:subject
	:references:in-reply-to:content-type:content-transfer-encoding;
	q=dns; s=default; b=ivfthVFy8rpACRDbszwNZGFwSQTLjSd7DqNKXfMjCbV
	T+prOOhEMDipEotsK3V5KiF/XOD+uEUeGM2Nvxl3Uczd1QQyYyFMaT5TUkc6IAzw
	RViNu8BPJOlmVPNv1kUdp5U8Va676IQsUyGGQ0YgNIGc/bZAaKlbRlKvnQ5IjhII
	=
DKIM-Signature:	v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:message-id:date:from:mime-version:to:subject
	:references:in-reply-to:content-type:content-transfer-encoding;
	s=default; bh=+HVqOjMIAOVxfYQrArSok71S1Sk=; b=n1S8QT66xOKymClne
	ReXoJ1ZB7L4lQ6iyv8mFrJL7vv383omcvlgttjQAGwJ98dc8VMfYMV1gMjBKNcyP
	31BnpXCTUuez2mGWKkiVqY3hMkCr/BwYT2cKgGj9Iju1HIJx50r+i+GlvOt05mKj
	kW/WvrtYeaD1VsYPF6qgeWBxL4=
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
X-Spam-SWARE-Status:	No, score=-1.4 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_DNSWL_NONE,RCVD_IN_HOSTKARMA_YE autolearn=ham version=3.3.1
Message-ID:	<51C277A4.20709@codespunk.com>
Date:	Wed, 19 Jun 2013 23:31:48 -0400
From:	"Matt D." <matt AT codespunk DOT com>
User-Agent:	Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.28) Gecko/20120306 Thunderbird/3.1.20
MIME-Version:	1.0
To:	cygwin AT cygwin DOT com
Subject:	Re: Bug with Cygwin's 'quilt' is actually in 'patch'
References:	<51BFEB6E DOT 2040404 AT codespunk DOT com> <51BFF1F9 DOT 4040205 AT codespunk DOT com>
In-Reply-To:	<51BFF1F9.4040205@codespunk.com>

I've been looking further into this and it appears as though the problem 
is in 'patch' not 'quilt'. quilt is actually a collection of bash 
scripts and calls patch to do the actual patching.

Using the same example I provided earlier in the thread, the same error 
occurs when calling patch directly:

$ patch Imakefile patches/test.patch

Running dos2unix on test.patch will allow the patch to apply 
successfully. However, this is WRONG. Imakefile and the initially 
created test.patch both use CRLF line endings. The patch should 
definitely NOT apply by introducing actual disparity.

To summarize, the patch to Imakefile (CRLF) will apply if it is 
converted to LF line endings. Using the '--binary' switch seems to be a 
workaround for this issue.


On 6/18/2013 1:36 AM, Matt D. wrote:
> Built the latest source 0.60 (same version as Cygwin) from
> http://freecode.com/projects/quilt. Built on CentOS 6.4 and passes my
> previously provided test just fine.
>
> Downloaded the same source to Cygwin, rebuilt, replaced quilt in /bin;
> test still errors out. I also tried the latest cygwin1.dll snapshot;
> same problem.
>
>
> On 6/18/2013 1:09 AM, Matt D. wrote:
>> The last e-mail I supplied to the mailing list was missing the link to
>> the example. See this one for the link.
>>
>> ---
>>
>> There seems to be a problem with Cygwin's quilt. This simple example
>> simply alters a #define from 'MESAGL' to 'NX_MESAGL'. That's it.
>>
>> New quilt created, ok.
>> New patch, ok.
>> Edit file, ok.
>> Refresh (create patch), ok.
>> Rollback changes, ok.
>> Reapply patch.. error:
>>
>> >>> quilt push
>> >>> Applying patch test.patch
>> >>> patching file Imakefile
>> >>> Hunk #1 FAILED at 2.
>> >>> 1 out of 1 hunk FAILED -- rejects in file Imakefile
>> >>> Patch test.patch does not apply (enforce with -f)
>>
>> http://codespunk.com/files/upload/cygwin_quilt_00.zip
>>
>> Extract to a directory, cd in, and run 'quilt push' to generate the
>> error.
>>
>>
>>
>> --
>> 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
>>
>>
>>
>
> --
> 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
>
>
>

--
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

- Raw text -