MIME-Version: 1.0
In-Reply-To: <20100316202916.GO4290@trikaliotis.net>
References: <5ef8ba411003161215g7844d7edi6412ca57e5eb6e3d@mail.gmail.com>  	<20100316202916.GO4290@trikaliotis.net>
From: David Eisner <deisner@gmail.com>
Date: Tue, 16 Mar 2010 17:00:19 -0400
Message-ID: <5ef8ba411003161400u6c172302r98c64f4d0e9f1d43@mail.gmail.com>
Subject: Re: Patch, diff, and line-endings
To: cygwin@cygwin.com
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm
Precedence: bulk
Sender: cygwin-owner@cygwin.com
Mail-Followup-To: cygwin@cygwin.com

On Tue, Mar 16, 2010 at 4:29 PM, Spiro Trikaliotis
<an-cygwin@spiro.trikaliotis.net> wrote:
> No: patch is very picky here. From my experience, you will observe the
> same behaviour on a Linux machine.

I just tried it on a Linux box.  The patch succeeded with both dos-
and unix-style line endings there, too (as with Solaris 10).  This was
running CentOS 5.4, GNU diff 2.8.1, patch 2.5.4.  These are the same
versions on the Solaris box as it turns out.  Both are older than the
Cygwin versions (2.8.7 and 2.5.8 respectively).  When I get a chance,
I'll try the newer versions on Linux and see what happens.


> BTW: In the project mentioned above, we always solved the issue with
> =A0 =A0 dos2unix.

In my case I'm using git to generate patches, and handing them off to
another developer.  My head hurts thinking about the hoops one or both
of us would have to jump through to get this working on a regular
basis.  In any case, we're using Eclipse and it happily applies
patches with CRLF's in them. So at this point it's academic.  I'd
still like to know what's going on, though.

-David

--=20
David Eisner     http://cradle.brokenglass.com

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