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

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

From: Noel Yap <yap_noel_at_yahoo.com>
Date: 2002-11-13 22:15:24 CET

--- solo turn <soloturn99@yahoo.com> wrote:
> our users did not care about line endings up to now,
> and i don't
> think we should introduce this now, in 2002, cause
> of svn, by letting
> users add a property cause there is one makefile in
> our 5000 text
> files.
>
> for me there seem two solutions:
>
> - we can set diff to ignore line
> endings on text files.
>
> this seems to be the simplest solution
> but you have to provide some exception
> for make files ... cause the line-ending
> matters (with svn:eol-style=lf eg?)
>
> - we can set svn:eol-style=native
> as default for text files.
> in rare cases (for makefiles e.g) we would
> set it differently.
>
> which still leaves us with: what do i do
> with a file i get from unix (samba eg.),
> and i'm now working on win and my diff
> complains ...
>
> so basically it boils down to:
> i don't care what the server stores, as long the
> client does not
> bother about line-endings, no matter if i compare
> files with unix-,
> win-, or whatever line-endings.

I don't understand. If line-ending format matters for
makefiles, and developers are allowed to modify the
makefiles, doesn't this imply that developers need to
worry about line-ending format?

Noel

> and i think your winnt example is perferct for "its
> not ridiculous,
> cause no svn user cares, and no svn user will ever
> notice it.". and
> good software has the property: you don't notice it,
> cause it does it
> FOR you.

This is a philosophical difference. There are certain
things I'd prefer the tool to do automatically, and
other things I don't. No software tool of mine should
automatically mangle line endings (as many windows
editors do) unless the tool itself is meant for that
sole purpose (eg dos2unix and unix2dos).

> we, btw, do have a mixed environment, and we try to
> replace cvs,
> microsoft vss, and some other strange unusable
> proprietary tool.

Have you had the same problem with the other tools?
Noel

__________________________________________________
Do you Yahoo!?
U2 on LAUNCH - Exclusive greatest hits videos
http://launch.yahoo.com/u2

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 13 22:16:13 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.