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

RE: eol-style

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-05-26 19:16:35 CEST

> From: Russ Brown [mailto:pickscrape@gmail.com]
>
> Could this have anything to do with the fact that we imported our
> repository from our original CVS one using cvs2svn? I think this is
> the first working-copy commit on that file since the repository was
> originally imported.

It seems quite likely. But you should inquire as to how svn:eol-style got
set without normalizing the stored EOLs.

> This may also explain a number of large conflicts we've been getting.
> Would this mean that every single file in the repository that has that
> property set will appear to have been completely changed the first
> time it is commited since the import?

Quite possibly.

You might be able to clean up the situation by doing a complete checkout and
seeing if the client discovers that the EOLs are wrong for the eol-style and
cleans them up in the WC. In that case, you want to check in the WC as
quickly as possible, so people start working off a base with correct EOLs.

> If that's the case, I presume
> that if two developers change a file for the first time (on different
> branches) the merge would conflict because both changes will appear to
> have modified the entire file.

Well, the change to most of the lines would be non-conflicting, because it
would be the same in both WCs. But every place with a substantival change
would show a conflict, because Svn's merge will notice that the same line
has been changed in both WCs.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 26 19:20:15 2005

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