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

RE: line-endings of conflict-markers.

From: Gavin Lambert <gavinl_at_compacsort.com>
Date: 2005-11-28 22:42:03 CET

Quoth Kees <mailto:bluemoon@xs4all.nl>:
> We have standardized on windows line-endings because we found
> out that windows editors are very picky. So we took the easy
> way out for windows users and made it a bit more difficult
> for the linux users (Which fits nicely). But now we have an
> issue with the line-endings and I have not a good feeling
> that it will be solved because a bug report was created in
> 2003.

It's usually the reverse, in fact: programmer-oriented Windows tools, at
least, tend to deal with different line endings more easily than Linux
tools.

But I guess it depends on exactly which tools you're using :)

Still, it's easy enough to set up svn:eol-style=native, particularly
with autoprops.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 28 23:24:49 2005

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

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