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

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

From: Bert Huijben <B.Huijben_at_competence.biz>
Date: Fri, 28 Nov 2008 14:03:31 +0100


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).


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-28 14:03:51 CET

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.