[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-30 17:10:18 CET

> What exactly does "set all our clients to native eol" mean?

To be precise, it means that our clients are configured with autoprops
of the form: "*.java = svn:eol-style=native" for the appropriate

> Are you using auto-props to add the svn:eol-style property to
> all text files? If so, those only apply to newly-added files
> from those clients. You still need to explicitly add that
> property to all existing files, and then you will get the
> behavior you expect.

 All the relevant server files are already set with the svn:eol-style
property set to native. I just repeated a test I've done a dozen times
now. I branched from one of the imported lines, checked that the
svn:eol-style property was set to native on the server and client,
checked out a working copy and added a single line comment. I then did
an svn diff on my working copy and it showed that every single line had
changed. On commit and subsequent comparison of revisions, the same
thing is shown and this results in a conflict on any future merge of
that change to another branch.

 As I said, it seems as if the import managed to create the repo with
CRLF line endings and now any modify and commit results in every line
being shown as different as the eol-native converts the Windows
line-ending to Unix on commit. I guess the mass modify and re-commit is
the only answer if svn itself doesn't offer an easier way out of the
predicament we've put ourselves in somehow.

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 Tue Jan 30 17:10:39 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.