From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21001 invoked by alias); 21 Jun 2013 12:11:57 -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 20989 invoked by uid 89); 21 Jun 2013 12:11:56 -0000 X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.1 Received: from aquarius.hirmke.de (HELO calimero.vinschen.de) (217.91.18.234) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 21 Jun 2013 12:11:56 +0000 Received: by calimero.vinschen.de (Postfix, from userid 500) id 19E27520781; Fri, 21 Jun 2013 14:11:54 +0200 (CEST) Date: Fri, 21 Jun 2013 12:15:00 -0000 From: Corinna Vinschen To: cygwin@cygwin.com Cc: "Matt D." Subject: Re: Bug with Cygwin's 'quilt' is actually in 'patch' Message-ID: <20130621121154.GA7362@calimero.vinschen.de> Reply-To: cygwin@cygwin.com Mail-Followup-To: cygwin@cygwin.com, "Matt D." References: <51BFEB6E.2040404@codespunk.com> <51BFF1F9.4040205@codespunk.com> <51C277A4.20709@codespunk.com> <20130620074638.GD22578@calimero.vinschen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20130620074638.GD22578@calimero.vinschen.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2013-06/txt/msg00562.txt.bz2 On Jun 20 09:46, Corinna Vinschen wrote: > On Jun 19 23:31, 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. > > I can reproduce this problem on 32 bit Cygwin but not on 64 bit Cygwin. > > The 64 bit version has a newer patch version 2.7.1, while I so far > neglected to update the 32 bit version which is still on 2.6.1. I'll > build a new patch 2.7.1 for 32 bit today. I hope that fixes it for > 32 bit as well. Stay tuned for the announcement. Matt? Ping? Does the new patch 2.7.1 help? Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat -- 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