Re: svn commit: rev 4391 - [...]

"Bill Tutt" <rassilon@lyra.org> writes:

> > From: Philip Martin [mailto:philip@codematters.co.uk]
> >
> > Although this merge should not have been that big. Try
> >
> > svn diff http://svn.collab.net/repos/svn/trunk/README \
> http://svn.collab.net/repos/svn/branches/issue-1003-dev/README
>
> > and note that the branch files all contain line-feeds. Looks like

Correction, I think the branch files contain CRLF in the repository.

> > another(?) svn:eol-style problem. It might be a good idea to fix
> > the branch before attempting to merge it back onto the trunk.
>
> Oh blech. Well, in order to save everyone from another 5MB email, I
> won't bother fixing the branch at all. I'll just commit my other pending
> changes on the branch unless/until someone tweaks the commit mailer to
> be slightly less verbose.

The real question is what did you do for this commit? The merge
should have included r4371 which set the svn:eol-style to native, and
indeed the files on the branch do appear to have that setting when I
check some out. So I assume they had that setting when you committed
them.

Is it supposed to work like this, or did you run into an eol-style
bug? As I understand the eol-stuff, the client should have converted
from CRLF to LF before sending it to the server, but it appears not to
have done so.

Is this a known bug? Which Subversion revision are you using?

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