Re: Merge bug(let)

Philip Martin <philip@codematters.co.uk> writes:

> > > Note that the three files could each have svn:eol-style set to a
> > > different value.
> >
> > Hmpf, yes, that would be a problem.
> >
> > > Would you use the the setting appropriate for each
> > > file or would you pick one, the working copy most probably, and use
> > > that for all the files?
> >
> > And that sounds like a viable solution ;)
>
> Given my analysis above, I think the setting for the new merge source
> might be better. Tricky stuff this eol-conversion...

Eeek! That's not right! Suppose we merge an old change where neither
source has svn:eol-style into a working copy with svn:eol-style set to
native. In that case we probably want it all done using native.

How about this: if the merge changes the svn:eol-style then we use the
new style (that of the new merge source) for all the files. If the
merge doesn't change the svn:eol-style then we use the working copy
svn:eol-style for all files.

<Whisper>
Or how about we abandon eol-conversion as a bad idea?
</Whisper>

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org