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

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

From: Damian Sinclair <Damian.Sinclair_at_homechoice.net>
Date: 2007-01-31 16:59:59 CET

> However, the behavior you are seeing is definitely not the
> intended purpose so I'd be interested in figuring out what
> the problem is and I think "working around" it would be the
> wrong approach.

 I agree, but at some point we may have to brute-force resolve the
problem as it's causing issues with the acceptance of SVN.

> I don't see how this can be a problem with
> the vss2svn program but if it is we need to fix that
> (although perhaps the new auto-props feature in that script
> would have helped in your case).

 Actually, I checked again with the guy who did the conversion which
script he used and he went with svnimporter from polarion. I have no
idea if this makes a difference.

 
> 1. Check out a WC with files where svn:eol-style is native.
> 2. Examine the file and its copy in .svn/text base with a hex
> editor to make sure they both have the expected line ending.

 At this point, they both show as CRLF eol (on a Windows client), as
expected.

> 3. Make a change to the WC file as usual.
> 4. Run "svn diff" and confirm that you are seeing the
> "incorrect" behavior that every line is changed.

 Yep.

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

 Damian Sinclair

 

=======================================================================
Homechoice is a trading name of Video Networks Limited of 205 Holland Park Avenue, London W11 4XB and registered in England and Wales (No. 2740910).
This email may contain confidential and privileged information and is intended for the named or authorised recipients only. If you are not the named or authorised recipient of this email, please note that any copying, distribution, disclosure or use of its contents is strictly prohibited. If you have received this email in error please notify the sender immediately and then destroy it. The views expressed in this email are not necessarily those held by Video Networks Limited and we do not accept any liability for any action taken in reliance on the contents of this message. We do not guarantee that the integrity of this email has been maintained, nor that it is free of viruses, interceptions or interference.

_______________________________________________________________________
This email has been scanned for all known viruses by the MessageLabs Email Security System.
_______________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 31 17:02:32 2007

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