[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: more diff problems?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-11-01 14:55:56 CET

"Erik Huelsmann" <e.huelsmann@gmx.net> writes:

> The first chunk in a diff I run in the root directory in my svn
> repository adds a block from notes/assurance.txt with the following
> content. As you can see, it includes the whole file, although
> nothing has changed. Doing svn revert on this file and rerunning the
> diff excludes the file from the diff.

That file has incorrect line endings in the repository. It has
svn:eol-style set to native so it should be \n in the repository but
if you look at the text base you will see \r\n line endings. Thus the
file appears to have every line changed. When you revert the file you
reset the text-time, Subversion's timestamp check means that it
doesn't bother with a full text comparison. If you touch the working
copy file the diff will reappear.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Nov 1 15:39:20 2003

This is an archived mail posted to the Subversion Dev mailing list.