This is the mail archive of the
cygwin
mailing list for the Cygwin project.
Re: diff issue
- From: "Brian Wilson" <wilson at ds dot net>
- To: Andrey Repin <cygwin at cygwin dot com>
- Date: Thu, 30 Sep 2010 11:13:12 -0400
- Subject: Re: diff issue
- References: <1842787202.20100930054004@mtu-net.ru>
> 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