Re: cr, lf on merge ... implement or use gnu diff option?

Ben Collins-Sussman wrote:
>
> solo turn <soloturn99@yahoo.com> writes:
>
> > why the original line endings are stored in the repository (win, unix
> > mixed together), does svn not know the difference between "text" and
> > "binary"?
>
> svn only "canonicalizes" line endings if you set the svn:eol-style
> property on a file to "native". Otherwise it treats all data as
> data. Wouldn't it be ridiculous if you had a completely win32
> project, and the server stored everything as LF in the repository? Of
> course it would.

I recall looking at the code that if svn:eol-style is set to
something but native, then it'll convert any eol's that are not
of the specified svn:eol-style setting to that type of eol. So
there is a transformation of the original file that may happen
upon commit.

I may be wrong about this though.

>
> Have you read about svn:eol-style in the Book?
>
> http://svnbook.red-bean.com/book.html#svn-ch-6-sect-2.1

This could go into greater detail about how the eol code works.

Best,
Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org