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=l9ruaX/klVwIVpTl0fQskQKHiWWUlIv4c09d5HWd/6e
	lFQ14FY8t9BCJ+M1JD+fZeI/Nh6hemcz0e91c/xJbmRDrLcKbdwFX17hkij/BUn1
	0DAyO8W1ClsOV63VzP20Hr12hcqeV1uBNARD57OtqVCAXdLlTsctdw/ZNxRUjsa8
	=
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=umgXxOAw+P88Yabtcukv2pojSB0=; b=h/MK7ntY6mZJ9F53O
	YK4ZuDqtQnw/LzvexqtDsY0Z2UmcBX7WldksAOJ+xFFW+FRtsRycZIjvRYEhfeIr
	xEayqp2YUUMGXyPwFVQ2mT9FDutD/TJFwdoKdjFgkPTx8OYzPut5mWHN+yvVZ99z
	V05K20W3h09KqlptWxcnCWJIZs=
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,TW_CG autolearn=ham version=3.3.1
Message-ID:	<51C2A293.8020805@codespunk.com>
Date:	Thu, 20 Jun 2013 02:34:59 -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> <51C277A4 DOT 20709 AT codespunk DOT com> <20130620054715 DOT GC5122 AT ednor DOT casa DOT cgf DOT cx>
In-Reply-To:	<20130620054715.GC5122@ednor.casa.cgf.cx>

I'm building from Linux source from the X2Go git repository. The patches 
are being applied downstream to the last base nx libraries provided by 
NoMachine. It can't be helped if the original source has CRLF in this case.

I understand that Cygwin is trying to emulate Linux here, but I don't 
believe that is the appropriate response regarding tools like 'patch' 
which should not have this kind of limitation. The fact that it thinks:

 > \r\n <> \r\n

but..

 > \r\n == \n

As I mentioned previously, patch does NOT have this issue on Linux using 
the EXACT SAME test case.

This is definitely a bug.


On 6/20/2013 1:47 AM, Christopher Faylor wrote:
> On Wed, Jun 19, 2013 at 11:31:48PM -0400, Matt D. wrote:
>> 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.
>
> Sorry but we're emulating Linux here.  You shouldn't have CRLF endings
> on your text file if you want the tools to work reliably.
>
> cgf
>
> --
> 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 -