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

Re: Odd Conflicts (EOL issues) in repo converted from VSS

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2007-01-31 19:46:44 CET

Damian Sinclair wrote:
>> 5. If it is showing that every line has changed as you
>> describe, then again examine the WC file and its copy in
>> .svn/text-base using a hex editor. One of the two has to have
>> had its line endings changed.
> Nope. They both have CRLF endings still.
> Are you right to expect that the .svn/text-base version should have
> CRLF eol though? In the files that have been edited and are now behaving
> correctly, the text-base versions have LF eols. My theory was that this
> is as should be, because SVN uses LF eols internally and svn diff
> expects this and converts the file for comparison because of the native
> property.

Yes, I think you're correct, the text-base seems to always contain the
LF eol. So you're saying that once a file has been committed once, it
behaves correctly thereafter? In that case then I would agree that it
sounds like a problem with the import. I'm not sure how the Polarion
tool works so it is possible that it imported the file as CRLF instead
of LF which is now causing the problem.

Received on Wed Jan 31 19:47:21 2007

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.