Re: Patch, diff, and line-endings

2010-03-17 Thread David Eisner
On Tue, Mar 16, 2010 at 5:00 PM, David Eisner wrote: > 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. Also works fine on Linux with patch 2.5.8 (and diff 2.9 -- version 2.8.7 was never a stable release, I think).

Re: Patch, diff, and line-endings

2010-03-16 Thread David Eisner
On Tue, Mar 16, 2010 at 4:29 PM, Spiro Trikaliotis 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).

Re: Patch, diff, and line-endings

2010-03-16 Thread Spiro Trikaliotis
Hello David, * On Tue, Mar 16, 2010 at 03:15:13PM -0400 David Eisner wrote: > I'm running into a problem when applying patches. Here's a toy > example. I have a file, test.txt, with a one line change. I use diff > -u to generate a patch, and then I use patch to apply it. > > With unix-style li

Patch, diff, and line-endings

2010-03-16 Thread David Eisner
I'm running into a problem when applying patches. Here's a toy example. I have a file, test.txt, with a one line change. I use diff -u to generate a patch, and then I use patch to apply it. With unix-style line-endings (\n), everything works fine: $ file {a,b}/test.txt a/test.txt: ASCII text b/