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

solo turn <soloturn99@yahoo.com> writes:

> - we can set svn:eol-style=native
> as default for text files.

Yes, this is what you want. You've said that your group is moving
away from CVS. CVS has this behavior turned on by default, so you're
probably already used to it.

> 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 ...

Are you talking about the plain 'diff' program? I don't personally
know if 'diff' has switches that make it agnostic towards different
line-endings. But that's not Subversion's problem. You're talking
about a general problem with 'diff'.

If you're talking about the 'svn diff' command, then it will do what
you want, provided that the thing you're diffing has the eol-style
'native' property.

---------------------------------------------------------------------
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:10:37 2002