From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20432 invoked by alias); 28 Dec 2001 12:50:36 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Received: (qmail 20405 invoked from network); 28 Dec 2001 12:50:34 -0000 Received: from unknown (HELO itdomain003.itdomain.net.au) (203.63.157.208) by sources.redhat.com with SMTP; 28 Dec 2001 12:50:34 -0000 Received: from lifelesswks ([144.137.125.79]) by itdomain003.itdomain.net.au with Microsoft SMTPSVC(5.0.2195.3779); Fri, 28 Dec 2001 23:50:32 +1100 Message-ID: <001301c18f9e$3c7b1ab0$0200a8c0@lifelesswks> From: "Robert Collins" To: "Gary R. Van Sickle" , References: Subject: Re: [PATCH] Setup.exe "other URL" functionality Date: Fri, 28 Dec 2001 05:50:00 -0000 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 6.00.2600.0000 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 X-OriginalArrivalTime: 28 Dec 2001 12:50:32.0403 (UTC) FILETIME=[3C665A30:01C18F9E] X-SW-Source: 2001-12/txt/msg01231.txt.bz2 redirected to cygwin! ----- Original Message ----- From: "Gary R. Van Sickle" > > Thanks. BTW: If you can identify what made that huge patch (my money is > > on indent 2.2.7 inserting ^M's)'s that would be handy. > > > > Rob > > It's highly bizarre, but AFAICT it's not indent but rather something wrong with > "cvs diff". Here's my investigation so far, I'm on all text mounts: > > Experiment 1: > - mv my altered, indented "window.h" to "window.h.temp". A hex editor shows it > to have the correct CRLF line endings (i.e. no extra CRs or something like > that). > - do a clean checkout of cvs's window.h. The file on my system also shows > correct CRLF line ends. > - A "cvs diff" on the clean, just-checked-out source shows no differences. > - Do a "diff window.h window.h.temp" (not "cvs diff"). Shows only the actual > changes, not the entire file as being different. > - Replace the unaltered "window.h" with my "window.h.temp", and the "cvs > diff -pu" shows every line of the file to be different. > - Run "d2u" on my local "window.h", which is now the altered one. "cvs > diff -pu" *still* shows every line to be different! (so does a plain "cvs > diff", no -pu). I don't think that d2u does anything on text mounts. I may be wrong. (Because, when it writes, cygwin inserts ^M's.) When you open the unaltered file in vim, does it show [dos] in the status line? Ditto for the indented file. another thing to try: grab a fresh window.h, where cvs diff shows nothing. touch window.h - then try cvs diff again. If this shows every line different, cvs/diff/rcs is broken with respect to text mode. If this doesn't show every line different, I'll scratch my head a little too. Rob -- Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple Bug reporting: http://cygwin.com/bugs.html Documentation: http://cygwin.com/docs.html FAQ: http://cygwin.com/faq/