Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
Message-ID:	<6c4101c37b31$f71e2df0$1602a8c0@geoinformex.com>
Importance:	normal
MIME-Version:	1.0
Subject:	Re: Problem with patch 2.5.8-7
X-OriginalArrivalTime:	06 Sep 2003 20:50:40.0827 (UTC) FILETIME=[886EC0B0:01C374B8]
X-MimeOLE:	Produced By Microsoft MimeOLE V5.50.4927.1200
Date:	Mon, 15 Sep 2003 10:35:02 +0800
X-MS-Has-Attach:	yes
X-MS-TNEF-Correlator:
From:	"Volker Quetschke" <quetschke AT scytek DOT de>
To:	<cygwin AT cygwin DOT com>

--------------enigCB01645A8683FA7EA6BEB838
Content-Type: text/plain;
	format=flowed;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Hi!

>>I'm experiencing problems with the current patch program, version
>>2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)
>>
>>With the attached two files the following command worked with
>>previous versions of patch (still works if I go back to
>>patch 2.5.8-3 (my last version))
>>
>>But now:
>>$ patch -i dos_lineends.patch -b -p2
>>fails.
>>vc_common.mak is in: ./STLport-4.0/src/vc_common.mak
> 
> So it fails.  Interesting.  I wonder *how* it fails though. 
> http://cygwin.com/problems.html
Ok, I stepped into the usual trap. If it fails for me, it has to fail for
you also :-(

Details follow:

$ ll
total 4
drwxrwxr-x+   3 q        none            0 Sep  6 22:42 STLport-4.0/
-rwxrwxr-x    1 admins   none         3737 Sep  6 22:41 dos_lineends.patch*
[q AT lisi]/tmp/patchtest:{517}:
$ patch -i dos_lineends.patch -b -p2
patching file STLport-4.0/src/vc_common.mak
Hunk #1 FAILED at 42.
Hunk #2 FAILED at 53.
Hunk #3 FAILED at 63.
3 out of 3 hunks FAILED -- saving rejects to file STLport-4.0/src/vc_common.mak.rej

This time I attached the output of cygcheck -s -v -r.

As a data point, if I do a
$ dos2unix.exe STLport-4.0/src/vc_common.mak
first, the patch applies cleanly, but this is wrong,
both patch and file are DOS style files with 0D0A lineendings.

> P.S.: I tried it and it works for me.
It works if I use patch 2.5.8-3

Volker

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D

--------------enigCB01645A8683FA7EA6BEB838
Content-Transfer-Encoding: 7bit
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (MingW32)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/WknzPTXJup+KeF0RAtgCAKCoQ0UQ9tPtXlUsAYQBKlMVyt17ogCffXO5
XlqoPw+KKDGxyykxJbnSxpM=
=xelp
-----END PGP SIGNATURE-----

--------------enigCB01645A8683FA7EA6BEB838--

- Raw text -