On Nov 17, 2004, at 6:19 PM, Daniel Rall wrote:

Ben, I did run cvs2svn.py (compiled by Sander Striker) on the jakarta-
velocity CVS module.

velocity$ svn pg 'svn:eol-style' xdocs/developer-guide.xml
native

XEmacs doesn't show me any ^M characters in the WC, but I do see them at
the end of every line in the corresponding text-base. Is this the same
cvs2svn.py conversion problem reported by the Mono folks?



Most likely, yup. You saw my explanation, right? cvs2svn.py 1.1 will set 'native' eol-style on any RCS file not marked with -kb. But it doesn't check to see that the RCS file actually is all LF endings, as it's "supposed" to be. Jackr already demonstrated (as did the Mono folks) that there are ways to corrupt the RCS files into having CRLF crap in it, and cvs2svn doesn't detect that.


So ultimately, you end up with an svn file that has native eol-style, but mixed line endings in the repository (and text-base). That causes spurious diffs.


--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to