Mailing-List:	contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT sources DOT redhat DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT sources DOT redhat DOT com>
List-Help:	<mailto:cygwin-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT sources DOT redhat DOT com
Delivered-To:	mailing list cygwin AT sources DOT redhat DOT com
Message-Id:	<4.3.1.2.20001129132907.021d0668@pop.ma.ultranet.com>
X-Sender:	lhall AT pop DOT ma DOT ultranet DOT com
X-Mailer:	QUALCOMM Windows Eudora Version 4.3.1
Date:	Wed, 29 Nov 2000 13:31:24 -0500
To:	Chuck DOT Irvine AT mail DOT sprint DOT com, cygwin AT sourceware DOT cygnus DOT com,
	ntemacs-users AT cs DOT washington DOT edu
From:	"Larry Hall (RFK Partners, Inc)" <lhall AT rfk DOT com>
Subject:	Re: ediff falsely identifying a difference as white space only
In-Reply-To:	<H00009db076a2b34.0975522121.kcopmp06@MHS>
Mime-Version:	1.0

At 01:22 PM 11/29/2000, Chuck DOT Irvine AT mail DOT sprint DOT com wrote:
>I'm trying to use vc-resolve-conflicts using ntemacs (20.7.1) and Cygwin
>(1.1.x). First I had to download the newestest version of ediff because
>the one that ships with ntemacs expects a version of diff(3) that
>accepts the -binary flag. Diff that comes with Cygwin doesn't accept
>this arg. After I installed ediff, I tried to invoke
>vc-resolve-conflicts on the attached file (A.java). The ediff windows
>came up as expected, highlighting a single conflict. The problem is that
>when I moved to this conflict, ediff outputs in the mode line "Only
>white-space differences in region 1 in buffers A & B" which, if you
>look, isn't the case.
>
>I suspect that the problem might have something to do with those cursed
>"^M"s - I don't know. I suspect this because when I look into the
>*ediff-fine-diff* buffer, I see:
>
>====1^M
>1:3c^M
>   ddsdfsdffadfs^M
>2:3c^M
>3:3c^M
>   dbbkk^M
>
>I'd really like to use ediff's conflict related functionality. Any help
>is much appreciated. Thanks
>
>Chuck Irvine
>Sprint



Since I don't know anything about ediff, its hard for me to speak 
definitively on this point but it would seem to me that this issue is 
with ediff getting confused by the carriage returns (^M).  Do you have
problem if the files being compared are binary?  Perhaps you need to 
better ediff??



Larry Hall                              lhall AT rfk DOT com
RFK Partners, Inc.                      http://www.rfk.com
118 Washington Street                   (508) 893-9779 - RFK Office
Holliston, MA 01746                     (508) 893-9889 - FAX



--
Want to unsubscribe from this list?
Send a message to cygwin-unsubscribe AT sourceware DOT cygnus DOT com

- Raw text -