[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: Damian Sinclair <Damian.Sinclair_at_homechoice.net>
Date: 2007-01-31 09:59:44 CET

> So an "svn proplist -v <file>" in your working copy shows
> both "svn:eol-style : native" and "svn:mime-type :
> text/plain"?

 The mime-type isn't set, the eol-style is. Seeing as all the operations
outside of this one are working fine and the svn book's statement:
"Unless otherwise noted using a versioned file's svn:mime-type property,
Subversion assumes the file contains human-readable data.", Subversion
seems happy to assume that these files are text seeing as they aren't
set to be anything else. Is this viewpoint wrong?

>I'm not sure I follow what you mean by "branched
> from one of the imported lines".

 As I mentioned, the repo was produced by importing from VSS. I am
saying that my test starts by taking a "virgin" imported branch.

> What happens if you do an svn diff without modifying the file at all?

 Then no differences are shown.

> Are you sure that your text editor isn't changing the line
> endings also?

 Yes, quite sure.

 Thanks for your help,

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 09:59:59 2007

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