[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-30 16:46:02 CET

Damian Sinclair wrote:
> We've set all our clients (we work on both Windows and Linux) to native
> eol, but what appears to have happened is that the original import
> somehow preserved the Windows eol markers from the VSS repo. Now, when
> we make a change, SVN converts the entire file to Unix eols and then its
> internal diff defines that commit as conflicting in all circumstances.
>

What exactly does "set all our clients to native eol" mean? 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. You could either do a single huge
commit in which you check out your entire repo, set the svn:eol-style
property on all relevant files using a script or command line, and then
commit all those property changes as one change; or else implement a
policy where each person who works on a file checks to see whether the
property is set, and sets it if not when they perform their next commit.

toby

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 30 16:46:32 2007

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