X-Recipient: archive-cygwin AT delorie DOT com X-SWARE-Spam-Status: No, hits=-0.2 required=5.0 tests=AWL,BAYES_50,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org From: "Brian Wilson" To: Andrey Repin Subject: Re: diff issue Date: Thu, 30 Sep 2010 11:13:12 -0400 Message-Id: <20100930151033.M76347@ds.net> In-Reply-To: <1842787202.20100930054004@mtu-net.ru> References: <1842787202 DOT 20100930054004 AT mtu-net DOT ru> X-OriginatingIP: 57.250.242.249 (wilson) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 X-IsSubscribed: yes Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner AT cygwin DOT com Mail-Followup-To: cygwin AT cygwin DOT com Delivered-To: mailing list cygwin AT cygwin DOT com > Greetings, All! > > I have strange (to me) issue that I'm not entirely sure how to interpret. > > Let's say I have two versions of the same batch file: > > The old version from CVS: > > > rem $Id: backup.bat,v 1.1 2007/07/17 01:53:30 Daemon Exp $ > > rar a -ag-YYYY-MM-DD_HH-MM -- MinerTimer @MinerTimer.list > > The new version I've imported to Subversion: > > > @echo off > > rem $Id: backup.bat 10 2010-09-30 01:22:14Z anrdaemon $ > > rar a -ag-YYYY-MM-DD_HH-MM -- MinerTimer @MinerTimer.list > > When I'm comparing them with my usual macro > diff -bdu -x "CVS" -x ".svn" -I "\$Id.*\$" -I "\$Revision.*\$" -I > "\$Date.*\$" -I "\$Author.*\$" --strip-trailing-cr -- '1/backup.bat' > 'backup.bat' > > It telling me that $Id$ lines are differ. > But when I remove the "@echo off" from second file, it telling me > that files are "identical" (the expected result). > > Having hard times dechiphering man diff, so if anyone can enlighten > me in simple words on the matter, I'd appreciate help greatly. > > -- > WBR, > Andrey Repin 30.09.2010, <5:33> > > Sorry for my terrible english... > Be sure the end of line characters are correct on the "@echo" line. You should be able to do this with a "cat -vTE" command. (sorry for my terrible Russian) Убедитесь, что конец строки символы правильно на "@echo" линии. Вы должны быть в состоянии сделать это с помощью "cat -vTE" команды. (Извините за мой ужасный русский) Sincerely, Brian S. Wilson -- Problem reports: http://cygwin.com/problems.html FAQ: http://cygwin.com/faq/ Documentation: http://cygwin.com/docs.html Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple