From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18714 invoked by alias); 20 Jun 2013 06:35:09 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Received: (qmail 18691 invoked by uid 89); 20 Jun 2013 06:35:05 -0000 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 Received: from p3plsmtpa08-02.prod.phx3.secureserver.net (HELO p3plsmtpa08-02.prod.phx3.secureserver.net) (173.201.193.103) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 20 Jun 2013 06:35:04 +0000 Received: from [10.0.1.102] ([68.9.29.195]) by p3plsmtpa08-02.prod.phx3.secureserver.net with id qWb21l0034CauTG01Wb2Pv; Wed, 19 Jun 2013 23:35:03 -0700 Message-ID: <51C2A293.8020805@codespunk.com> Date: Thu, 20 Jun 2013 07:44:00 -0000 From: "Matt D." 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@cygwin.com Subject: Re: Bug with Cygwin's 'quilt' is actually in 'patch' References: <51BFEB6E.2040404@codespunk.com> <51BFF1F9.4040205@codespunk.com> <51C277A4.20709@codespunk.com> <20130620054715.GC5122@ednor.casa.cgf.cx> In-Reply-To: <20130620054715.GC5122@ednor.casa.cgf.cx> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2013-06/txt/msg00524.txt.bz2 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