On Wed, Oct 29, 2008 at 2:17 PM, Robert P. J. Day <rpjday_at_crashcourse.ca> wrote:
> oh, i know how to fix the files *locally*. since all of my stuff
> is checked in, i can trivially check out a fresh working copy, make
> massive normalization changes, and check back in without a problem.
> that part's easy.
>
> what i'm after is what prep work i need to do for the *others*
> who all have working copies in which they're currently doing work,
> so that when *they* try to update, they're not hit with a blizzard
> of merge conflicts based on different EOLs.
>
> i've already told them to edit .subversion/config, and set up
> an eol-style of LF. and they do use a mixture of tortoise, rapidsvn
> and straight command line checkouts. so i'm trying to lock this
> down so that, once we get all this normalized, it can't get out of
> sync again based on people mixing their editor usage.
Then, all you have to do is add in the pre-commit hook to prevent
people from checking in these files unless svn:eol-style is on the
file. I believe the auto-properties only works with new files, so you
have to force users to add the svn:eol-style property to pre-existing
files before they do the commit. Otherwise, the developers will simply
mess up the files again.
The hook enforces your policy. The auto-properties just is a
convenience for the developers.
--
David Weintraub
qazwart_at_gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-29 19:36:09 CET