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

Huge diff for one-line change in ASF repository

From: Konstantin Kolinko <knst.kolinko_at_gmail.com>
Date: Fri, 14 Oct 2011 17:43:03 +0400

Hi!

One of committers in Apache Tomcat project is experimenting with Git
<-> Subversion integration.

A result is that in the last few days several commits produced diffs
for entire file. An example:

http://svn.apache.org/viewvc?view=revision&revision=1183340
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?r1=1183339&r2=1183340

Commit e-mail:
http://markmail.org/message/f4rdxrjvrenc6tg6
http://markmail.org/message/iysr4bsfckegq7vp

How can this happen from subversion point of view?
The file has svn:eol-style=native.

AFAIK such files are stored with LF endings at the server. Is this
line endings convention enforced on the client only?

I am on Windows. Both
svn cat http://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java@1183339
svn cat http://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java@1183340

produce files with CRLF endings for me, so I do not see such huge
difference between the files.

But diff command below does produces that huge diff, that is shown by
viewvc and was in the commit email:

svn diff -c 1183340
http://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Besides the diff I do not have other evidence that the file in
repository has CRs or is otherwise broken.

Best regards,
Konstantin Kolinko
Received on 2011-10-14 15:43:36 CEST

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

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