[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: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-11-28 18:46:29 CET

On Nov 28, 2005, at 16:27, Paul Koning wrote:

>> We decided to adapt microsoft line-endings (CR-LF) throughout
>> our whole sourcecode. We develop on linux and on windows and
>> now we are able to copy svn-directories between the 2 operating
>> systems.
> That seems very strange. If you set the line ending to native, you
> can check out on either side without trouble.

That's not strange. We have a Linux web and file server and mostly
Windows workstations. We might check something out onto a Samba share
using TortoiseSVN on a Windows machine and then use it from the Linux
commandline, or we might check it out on the Linux commandline and
later use it on a Windows client. "Native" line endings are useless
in this scenario as they're native to the platform that did the
checkout, which is not necessarily the platform now wanting to edit
the working copy.

> Even if you want to check out on one system and just copy the
> directory, Unix line endings are the better answer -- with the
> exception of Windows-specific files like MSVC++ project files.

I agree: Unix line endings would be a better choice, and it's what
we've standardized on in our company. But perhaps that's only because
a good Windows editor can deal with files with Unix line endings,
while Unix/Linux commandline utilities in my experience cannot.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 28 19:25:16 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.