You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <B....@competence.biz> on 2008/11/28 13:03:31 UTC

Inconsistent line endings in svn diff (in combination with svn:eol-style native) [Issue #3338]

	Hi,

Looking into an AnkhSVN issue I was trying to solve I found that
subversion provides inconsistent line endings on Windows in some very
common scenario.

<create text file A.txt with a few lines>
svn add A
svn ps svn:eol-style native A
svn ci -m ""

<edit A>

svn diff A

The output from svn diff now has "\r\n" line endings in the headers, and
"\n" line endings in the file content blocks.


The libsvn_diff library where the file output is constructed uses the
real line endings of the file for separating the context blocks
(diff_file.c: output_line). 

I think this functions should allow overriding the line ending style. 

(My AnkhSVN issue would be much easier to resolve if the diff api would
have used svn_stream_t instead of apr_file_t. I could just use one of
the standard transform streams in that case).

	Bert





---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org