X-Recipient:	archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status:	No, hits=1.5 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,KAM_THEBAT
X-Spam-Check-By:	sourceware.org
Date:	Fri, 1 Oct 2010 18:00:33 +0400
From:	Andrey Repin <anrdaemon AT freemail DOT ru>
Reply-To:	Andrey Repin <cygwin AT cygwin DOT com>
Message-ID:	<224999170.20101001180033@mtu-net.ru>
To:	Csaba Raduly <rcsaba AT gmail DOT com>, cygwin AT cygwin DOT com
Subject:	Re: diff issue
In-Reply-To:	<AANLkTikfp18iz5dmcXtE_LskjEqepXiUEMigq3TcT0bh@mail.gmail.com>
References:	<1842787202 DOT 20100930054004 AT mtu-net DOT ru> <20100930151033 DOT M76347 AT ds DOT net> <191883817 DOT 20101001042301 AT mtu-net DOT ru> <20101001015713 DOT M64956 AT ds DOT net> <AANLkTikfp18iz5dmcXtE_LskjEqepXiUEMigq3TcT0bh AT mail DOT gmail DOT com>
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, Csaba Raduly!

> Andrey Repin wrote:
>>>>> 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).

> Did you get something similar to the following ?

Practically, I get exactly this result.

> --- 1/backup.bat     2010-10-01 09:55:59.070190500 +0200
> +++ backup.bat     2010-10-01 09:56:19.112194500 +0200
> @@ -1,2 +1,3 @@
> -rem $Id: backup.bat,v 1.1 2007/07/17 01:53:30 Daemon Exp $
> +@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

> I suspect that the -I switch told diff "do not start a difference if
> the line matches" rather than "consider this line to always match".

> This behavio(u)r is counter-intuitive, but is probably required;
> otherwise the generated diff would be unusable for patch(1).

I was thinking the same way.


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

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 -