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
X-Apparently-From: <jwalsky AT yahoo DOT com>
Message-ID: <003e01c0c827$6685d320$2401000a@pinto>
From: "Joshua Walsky" <jwalsky AT yahoo DOT com>
To: <cygwin AT cygwin DOT com>
References: <H00009db09e4cdb1 DOT 0987605389 DOT kcopmp06 AT MHS>
Subject: Re: emacs and cvs : ediff, merge, and ^M
Date: Wed, 18 Apr 2001 11:48:30 -0500
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.50.4133.2400
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400


I grabbed a new version of ediff
ftp.cs.sunysb.edu/pub/TechReports/kifer/ediff.tar.gz and everthing seems to
be behaving correctly.  I had the same problems with untarring, and also
prefer untarring into a single top level directory.  Thanks for the help.

- joshua


----- Original Message -----
From: <Chuck DOT Irvine AT mail DOT sprint DOT com>
To: <jwalsky AT yahoo DOT com>; <kifer AT cs DOT sunysb DOT edu>
Sent: Wednesday, April 18, 2001 9:49 AM
Subject: RE: emacs and cvs : ediff, merge, and ^M


> Michael,
>
> I just downloaded and tried to untar the latest version of ediff. The
> tar command fails as indicated below. Personally, I find it preferable
> to have a tar file distribution wrapped in a top level directory, so to
> speak. That is, the whole tarball would untar into a single directory,
> e.g. ediff-<version-info>. Thanks
>
> Chuck
>
> > tar xfvz ediff.tar.gz
> README
> Makefile
> ediff.el
> ediff-diff.el
> ediff-util.el
> ediff-init.el
> ediff-help.el
> ediff-tbar.el
> ediff-merg.el
> ediff-wind.el
> ediff-mult.el
> ediff-vers.el
> ediff-ptch.el
> ediff-hook.el
> toolbar/
> toolbar/CVS/
> toolbar/CVS/Root
> toolbar/CVS/Repository
> toolbar/CVS/Entries
> toolbar/ediff-A-up.xpm
> toolbar/ediff-A-xx.xpm
> toolbar/ediff-B-up.xbm
> toolbar/ediff-B-up.xpm
> toolbar/ediff-B-xx.xpm
> toolbar/ediff-help.xbm
> toolbar/ediff-help.xpm
> toolbar/ediff-next.xbm
> toolbar/ediff-next.xpm
> toolbar/ediff-prev.xbm
> toolbar/ediff-prev.xpm
> toolbar/ediff-update.xpm
> toolbar/ediff-quit.xbm
> toolbar/ediff-quit.xpm
> toolbar/ediff-refine.xbm
> toolbar/ediff-refine.xpm
> toolbar/ediff-save-xx.xbm
> toolbar/ediff-save-xx.xpm
> toolbar/ediff-save.xbm
> toolbar/ediff-save.xpm
> toolbar/ediff-toggle-split-up.xbm
> toolbar/ediff-toggle-split-up.xpm
> toolbar/ediff-update.xbm
> toolbar/ediff-A-up.xbm
> ediff.texi
> ../info/ediff
> tar: ../info/ediff: Member name contains `..'
> ../info/ediff-1
> tar: ../info/ediff-1: Member name contains `..'
> ../info/ediff-2
> tar: ../info/ediff-2: Member name contains `..'
> ../info/ediff-3
> tar: ../info/ediff-3: Member name contains `..'
> ediff.dvi
> tar: Error exit delayed from previous errors
>
> > -----Original Message-----
> > From: Irvine, Chuck R.
> > Sent: Wednesday, April 18, 2001 9:11 AM
> > To: 'kifer'
> > Cc: 'cygwin'; 'jwalsky'; 'ntemacs-users'
> > Subject: RE: emacs and cvs : ediff, merge, and ^M
> >
> >
> > Yes, changing to "(coding-system-for-read 'raw-text)" also
> > fixes the problem. Thanks. Chuck
> >
> > > -----Original Message-----
> > > From: kifer [mailto:kifer AT cs DOT sunysb DOT edu]
> > > Sent: Tuesday, April 17, 2001 9:09 PM
> > > To: Chuck.Irvine
> > > Cc: kifer; cygwin; jwalsky; ntemacs-users
> > > Subject: Re: emacs and cvs : ediff, merge, and ^M
> > >
> > >
> > >
> > >
> > > Chuck,
> > > this line is needed because of Mule.
> > > However, you are using an old version apparently, because
> > > several mos ago
> > > it was changed. 'raw-text is now used.
> > > Can you check if this also solves the problem you describe?
> > > (I recall that this was hashed out with a number of NT
> > users as well.)
> > >
> > >
> > > --michael
> > >
> > >
> > > Chuck.Irvine writes:
> > > >
> > > > I had a hunch that the ^M characters that I was seeing in
> > > the buffer
> > > > *ediff-fine-diff* were the cause of this problem. So, I
> > > started poking
> > > > around to see if I could see where this buffer was being
> > > populated and
> > > > started examining the method ediff-exec-process. Pretty
> > quickly the
> > > > line
> > > > (coding-system-for-read 'no-conversion) caught my eye.
> > Since I had
> > > > previously thought that the problem might be related to
> > > coding-system
> > > > effects, I commented this line out, evaluated the method,
> > and tried
> > > > again, just to see what happened. Lo and behold, the
> > > problem went away,
> > > > i.e. ediff correctly identified the diffs as real instead
> > of just a
> > > > difference in white space. I've tried a few more things and
> > > so far it
> > > > doesn't seem like I've broken anything.
> > > >
> > > > So, Michael, what is the purpose of this line of code? Do
> > you think
> > > > commenting it out will break something somewhere? Any alternative
> > > > suggestions? Thanks.
> > > >
> > > > Joshua, BTW, the first thing that you will need to do is
> > > download and
> > > > install the latest version of ediff. Sorry, I can't
> > > remember where I
> > > > downloaded it from. And, also, many people will ignore html
> > > formatted
> > > > email - not sure exactly why.
> > > >
> > > > Chuck
> > > >
> > > > -----Original Message-----
> > > > From: jwalsky [mailto:jwalsky AT yahoo DOT com]
> > > > Sent: Tuesday, April 17, 2001 6:34 PM
> > > > To: cygwin
> > > > Cc: jwalsky; Chuck.Irvine
> > > > Subject: emacs and cvs : ediff, merge, and ^M
> > > >
> > > >
> > > >
> > > >
> > > > I saw the thread initiated by Chuck Irvine about ediff
> > and carriage
> > > > returns (^M) on Windows back in November, but could not find any
> > > > resolution.
> > > >
> > > > http://cygwin.com/ml/cygwin/2000-11/threads.html#01515
> > > >
> > > > I am experiencing similar problems, both --binary not being
> > > understood
> > > > and ^M appearing upon merge.  When files are merged
> > through the cvs
> > > > update command (with or without conflicts) ^M are inserted
> > > in the new
> > > > versions.    It seems that whatever is doing the merge for cvs is
> > > > inserting these carriage returns?  Is there any way to stop
> > > this?  Is
> > > > this a configuration issue?  I am not too concerned about
> > > the --binary
> > > > issue since I really haven't looked into it thoroughly
> > > enough, however,
> > > > I could use some help with the carriage returns.
> > > >
> > > > The ediff version I have is 2.70.2 (as indicated by ediff-version)
> > > > The emacs version I have is 20.7.1 (as indicated by version)
> > > > The cvs version is 1.11 (as indicated by cvs --version)
> > > > My cygwin.dll version is 1.1.8 (that is the version I
> > > downloaded... how
> > > > can I figure this out if I forgot?)
> > > >
> > > > Thanks in advance,
> > > > - joshua
> > > >
> > > > --openmail-part-2451634c-00000001--
> > > >
> > >
> > >
> > >
> >
>


_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com


--
Want to unsubscribe from this list?
Check out: http://cygwin.com/ml/#unsubscribe-simple