X-Recipient:	archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status:	No, hits=2.4 required=5.0 tests=AWL,BAYES_20,FREEMAIL_FROM,KAM_THEBAT
X-Spam-Check-By:	sourceware.org
Date:	Fri, 1 Oct 2010 04:23:01 +0400
From:	Andrey Repin <anrdaemon AT freemail DOT ru>
Reply-To:	Andrey Repin <cygwin AT cygwin DOT com>
Message-ID:	<191883817.20101001042301@mtu-net.ru>
To:	"Brian Wilson" <wilson AT ds DOT net>, cygwin AT cygwin DOT com
Subject:	Re: diff issue
In-Reply-To:	<20100930151033.M76347@ds.net>
References:	<1842787202 DOT 20100930054004 AT mtu-net DOT ru> <20100930151033 DOT M76347 AT ds DOT net>
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, Brian Wilson!

>> 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.

> 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.

They are "correct" for windows batch fine (CRLF) and consistent for both
files.
However, changing line endings didn't changed the end result. I'm leaning
towards diff specifics in treatment of ignored lines in scope of actually
changed lines.

> (sorry for my terrible Russian)

:) If my English was the same as your Russian, accept my deepest apology.


--
WBR,
 Andrey Repin (anrdaemon AT freemail DOT ru) 01.10.2010, <4:17>

Sorry for my terrible english...


--
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 -