This is the mail archive of the cygwin mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: diff issue


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]