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
From:	Chuck DOT Irvine AT mail DOT sprint DOT com
X-OpenMail-Hops:	1
Date:	Fri, 19 Jan 2001 17:14:28 -0600
Message-Id:	<H00009db08285507.0979946067.kcopmp06@MHS>
Subject:	RE: ^M diff related problem
MIME-Version:	1.0
TO:	Chuck DOT Irvine AT mail DOT sprint DOT com
CC:	C DOT Conrad AT cli DOT de, christoph DOT conrad AT gmx DOT de, cygwin AT sourceware DOT cygnus DOT com,
	kifer AT cs DOT sunysb DOT edu

--openmail-part-1dae6ea2-00000001
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
	;Creation-Date="Fri, 19 Jan 2001 17:14:28 -0600"
Content-Transfer-Encoding: 7bit

No difference, I'm afraid:

> export TEMP=/tmp
> rm test test2
> echo hello >> test
> echo hello >> test2
> echo hello >> test2
> diff -C 2 test test2 | cat -v -
*** test        Fri Jan 19 17:22:34 2001^M
--- test2       Fri Jan 19 17:22:48 2001^M
***************^M
*** 1 ****^M
--- 1,2 ----^M
  hello^M
+ hello^M

Just curious - why might the setting of TEMP make a difference? Thanks, 
anyway, though.

Chuck

> -----Original Message-----
> From: earnie.boyd [mailto:earnie_boyd AT yahoo DOT com]
> Sent: Friday, January 19, 2001 5:06 PM
> To: Chuck.Irvine
> Cc: cygwin; C.Conrad; christoph.conrad; kifer
> Subject: Re: ^M diff related problem
> 
> 
> What is your TEMP variable set to?
> 
> What happens if you `export TEMP=/tmp'?
> 
> Cheers,
> Earnie.
> 
> Chuck DOT Irvine AT mail DOT sprint DOT com wrote:
> > 
> > When invoking diff in a bash shell, output gets generated with ^M
> > terminated lines. This seems to cause certain diff dependent emacs
> > commands, e.g. vc-resolve-conflicts, to misbehave. To illustrate:
> > 
> > ***********************************************
> > > echo hello >> test
> > > echo hello >> test2
> > > echo hello >> test2
> > > diff -C 2 test test2 | cat -v -
> > *** test        Fri Jan 19 16:52:24 2001^M
> > --- test2       Fri Jan 19 16:52:44 2001^M
> > ***************^M
> > *** 1 ****^M
> > --- 1,2 ----^M
> >   hello^M
> > + hello^M
> > > echo $CYGWIN
> > binmode
> > ************************************************
> > 
> > I've done some reading regarding binary vs text mode and the only
> > relevant config setting I can find is setting CYGWIN to 
> binary, which
> > I've done, as shown above. After doing so, I still get the 
> error above.
> > 
> > Any help with getting rid of these ^M would be greatly appreciated.
> > 
> > Chuck
> > Sprint
> > 
> >   
> --------------------------------------------------------------
> ----------
> > --
> > Want to unsubscribe from this list?
> > Check out: http://cygwin.com/ml/#unsubscribe-simple
> 
> _________________________________________________________
> Do You Yahoo!?
> Get your free @yahoo.com address at http://mail.yahoo.com
> 
> 


--openmail-part-1dae6ea2-00000001
Content-Type: text/plain; charset=us-ascii

--
Want to unsubscribe from this list?
Check out: http://cygwin.com/ml/#unsubscribe-simple
--openmail-part-1dae6ea2-00000001--

- Raw text -