Mailing-List: contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , 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 18:09:46 -0600 Message-Id: Subject: RE: ^M diff related problem MIME-Version: 1.0 TO: cygwin AT cygwin DOT com CC: C DOT Conrad AT cli DOT de, christoph DOT conrad AT gmx DOT de, kifer AT cs DOT sunysb DOT edu Content-Type: multipart/mixed; boundary="openmail-part-1daf035f-00000001" --openmail-part-1daf035f-00000001 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline ;Creation-Date="Fri, 19 Jan 2001 18:09:46 -0600" Content-Transfer-Encoding: 7bit Well, I'm more than a little embarrased, but I think the problem is solved. I was, er..., stammer.., using a version of diff other than the one shipped with cygwin. At Earnie's suggestion, I ran the cygcheck command, looked at my path, something clicked, and I recalled the alternate diff program that I had downloaded once upon a time. After renaming this verion, and re-running all the ugly problems went away, including the problem with vc-resolve-conflicts. Thanks to all who offered help and sorry for my carelessness. On a related note, I unset CYGWIN and tried the experiments again, thinking that ^M's might be appended to diff output, but they weren't. I guess I don't really understand the purpose of the CYGWIN=binary setting. I guess now it is a mystery what your problem is, Chris, unless you were making the same mistake that I was. Thanks > -----Original Message----- > From: earnie.boyd [mailto:earnie_boyd AT yahoo DOT com] > Sent: Friday, January 19, 2001 5:34 PM > To: Chuck.Irvine > Cc: C.Conrad; christoph.conrad; cygwin; kifer > Subject: Re: ^M diff related problem > > > Chuck DOT Irvine AT mail DOT sprint DOT com wrote: > > > > 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. > > > > I'm looking for differences in the file processing mode. Supply the > output of `cygcheck -s -r -v'. > > Cheers, > Earnie. > > _________________________________________________________ > Do You Yahoo!? > Get your free @yahoo.com address at http://mail.yahoo.com > > --openmail-part-1daf035f-00000001 Content-Type: text/plain; charset=us-ascii -- Want to unsubscribe from this list? Check out: http://cygwin.com/ml/#unsubscribe-simple --openmail-part-1daf035f-00000001--