Mail Archives: cygwin/2000/11/29/13:48:58
--openmail-part-1ad3f456-00000001
Content-Type: text/plain; charset=ISO-8859-1
Content-Disposition: inline
;Creation-Date="Wed, 29 Nov 2000 12:47:53 -0600"
Content-Transfer-Encoding: 8bit
Ediff is a visual differencing tool that comes with emacs. It's used as
the back end to vc-resolve-conflicts, one of the emacs version control
related commands, and is used to resolve cvs merge conflicts.
I'm not sure what you mean in your last sentence, but if you , mean find
something other than ediff, I'd rather find a fix. It's very nice once
its working.
Thanks,
Chuck
-----Original Message-----
From: lhall [mailto:lhall AT rfk DOT com]
Sent: Wednesday, November 29, 2000 12:31 PM
To: Chuck.Irvine; cygwin; ntemacs-users
Cc: lhall
Subject: Re: ediff falsely identifying a difference as white space only
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
--openmail-part-1ad3f456-00000001
Content-Type: text/plain; charset=us-ascii
--
Want to unsubscribe from this list?
Send a message to cygwin-unsubscribe AT sourceware DOT cygnus DOT com
--openmail-part-1ad3f456-00000001--
- Raw text -