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" <wilson AT ds DOT net>
To:	Andrey Repin <cygwin AT cygwin DOT com>
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
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Unsubscribe:	<mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
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)

&#1059;&#1073;&#1077;&#1076;&#1080;&#1090;&#1077;&#1089;&#1100;, &#1095;&#1090;&#1086; &#1082;&#1086;&#1085;&#1077;&#1094; &#1089;&#1090;&#1088;&#1086;&#1082;&#1080; &#1089;&#1080;&#1084;&#1074;&#1086;&#1083;&#1099; &#1087;&#1088;&#1072;&#1074;&#1080;&#1083;&#1100;&#1085;&#1086; &#1085;&#1072; "@echo" &#1083;&#1080;&#1085;&#1080;&#1080;. &#1042;&#1099; &#1076;&#1086;&#1083;&#1078;&#1085;&#1099; &#1073;&#1099;&#1090;&#1100; 
&#1074; &#1089;&#1086;&#1089;&#1090;&#1086;&#1103;&#1085;&#1080;&#1080; &#1089;&#1076;&#1077;&#1083;&#1072;&#1090;&#1100; &#1101;&#1090;&#1086; &#1089; &#1087;&#1086;&#1084;&#1086;&#1097;&#1100;&#1102; "cat -vTE" &#1082;&#1086;&#1084;&#1072;&#1085;&#1076;&#1099;. (&#1048;&#1079;&#1074;&#1080;&#1085;&#1080;&#1090;&#1077; &#1079;&#1072; &#1084;&#1086;&#1081; &#1091;&#1078;&#1072;&#1089;&#1085;&#1099;&#1081; 
&#1088;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;)

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

- Raw text -