Mailing-List: contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm
Sender: cygwin-owner AT sources DOT redhat DOT com
From: Chuck DOT Irvine AT mail DOT sprint DOT com
Date: Wed, 29 Nov 2000 21:32:08 -0600
Message-Id: <H00009db076c7f4d.0975555127.kcopmp06@MHS>
Subject: RE: ediff falsely identifying a difference as white space only
MIME-Version: 1.0
TO: cygwin AT sourceware DOT cygnus DOT com, ntemacs-users AT cs DOT washington DOT edu
Content-Type: multipart/mixed; boundary="openmail-part-1adce2e6-00000001"

--openmail-part-1adce2e6-00000001
Content-Type: text/plain; charset=ISO-8859-1
Content-Disposition: inline
	;Creation-Date="Wed, 29 Nov 2000 21:32:08 -0600"
Content-Transfer-Encoding: 8bit

I really appreciate all the help I've been offered regarding the
attached problem. Unfortunately, I haven't been able to resolve it yet,
partially, I'm afraid, because the original messages weren't
sufficiently clear. I hope you'll have the patience to bear with me
again.

I'm using ntemacs 20.7.1 and cygwin 1.1.6.

Problem #1:

1. Load the attached file foo.java into a buffer.
2. Invoke vc-resolve-conflicts on it.
3. The resolve conflicts windows should come up and you should 
   see that there is one conflict.
4. Press the "n" key. This causes an error. The contents of 
   *ediff-errors* buffer is:

/usr/bin/diff3: unrecognized option `--binary' /usr/bin/diff3: Try
`/usr/bin/diff3 --help' for more information.

In my previous message I mistakenly stated that my version of diff
doesn't accept the --binary flag. As indicated in the error messages
above, I should have said that my diff3 doesn't accept the --binary
flag. After a little investigation, this seems strange. I looked at the
latest docs for diff3 at www.gnu.org and there is no mention of a
--binary option to diff3.

Can anyone duplicate this problem?

Problem #2:

1. I downloaded and installed the latest version of ediff from
ftp://ftp.cs.sunysb.edu/pub/TechReports/kifer/ediff.tar.Z 
2. Load the attached file foo.java into a buffer.
3. Invoke vc-resolve-conflicts on it.
4. The resolve conflicts windows should come up and you should 
   see that there is one conflict.
5. Press the "n" key to move focus to the conflict/difference.
   Even though the A and B buffers show Chuck2 and Chuck1, 
   respectively, the message in the mini-buffer is "Only 
   white-space differences in region 1 in buffers A & B".

Well, at least now I hope I've been clear regarding the problems I'm
having. Any help is greatly appreciated.

Chuck Irvine
Sprint   

-----Original Message-----
From: Irvine, Chuck R. 
Sent: Wednesday, November 29, 2000 12:31 PM
To: NTEmacsUsers (E-mail); CygwinMailingList (E-mail)
Subject: ediff falsely identifying a difference as white space only


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 (foo.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


--openmail-part-1adce2e6-00000001
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="foo.java"
	;Creation-Date="Wed, 29 Nov 2000 21:32:08 -0600"
Content-Transfer-Encoding: base64

PDw8PDw8PCBmb28uamF2YQ0KMSBDaHVjazINCj09PT09PT0NCjEgQ2h1Y2sxDQo+Pj4+Pj4+
IDEuMTANCjEgc2NyYXRjaDENCjINCjMNCjQNCjUNCjYNCjcNCjgNCjkNCjEwDQoxMQ0KMTIN
CjEzDQoxNA0KMTUgDQo=


--openmail-part-1adce2e6-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-1adce2e6-00000001--