From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7308 invoked by alias); 20 Jun 2013 03:31:55 -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 7299 invoked by uid 89); 20 Jun 2013 03:31:54 -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 autolearn=ham version=3.3.1 Received: from p3plsmtpa07-08.prod.phx3.secureserver.net (HELO p3plsmtpa07-08.prod.phx3.secureserver.net) (173.201.192.237) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 20 Jun 2013 03:31:53 +0000 Received: from [10.0.1.102] ([68.9.29.195]) by p3plsmtpa07-08.prod.phx3.secureserver.net with id qTXq1l0084CauTG01TXrmt; Wed, 19 Jun 2013 20:31:52 -0700 Message-ID: <51C277A4.20709@codespunk.com> Date: Thu, 20 Jun 2013 05:47: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> In-Reply-To: <51BFF1F9.4040205@codespunk.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2013-06/txt/msg00522.txt.bz2 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