[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-02-01 10:40:33 CET

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

 Good, I'm glad my thinking isn't entirely faulty. Thanks for your time
on this.

 Now, this leaves me with how to resolve the problem.

 1/ Some form of subversion magic that converts the files internally.

 2/ Some method of forcing a commit without any change having occurred
so that the file gets reconverted. Can I just touch the files?

 3/ Adding a whitespace change to every file and committing.

 Any recommendations?

 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 Thu Feb 1 10:40:50 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.