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

Re: svn diff and native eol style

From: Branko Čibej <brane_at_xbc.nu>
Date: 2004-04-04 12:18:28 CEST

Tobias Ringstrom wrote:

> svn diff does not respect the EOL style, at least not when it is set
> to native. Before the diff is calculated or an external diff is
> called, the two files to be diffed are converted to NL EOL style.
> This means that on e.g. Win32, the diff chunks contain NL EOLs for
> files with native EOL style, which of course breaks patch among other
> things.
> I think the way to fix the problem is to convert the two files to the
> correct EOL style before diffing. I'm planning to write an issue
> about this, but I wanted to see if anyone had any comments first.

I don't think we should convert at all. If the files differ only in the
EOL style, I think diff should show that (unless given an ignore-eol or
ighore-whitespace option).

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 4 12:16:59 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.