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

Re: Tortoise is changing file ending on update; I want Unix lines preserved

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Mon, 1 Nov 2010 09:15:50 +0100

On Saturday 30 October 2010, Larry A. Taylor wrote:
> TortoiseSVN 1.6.11, Build 20210 - 32 Bit , 2010/09/30 20:36:44
> I use tortoise/subversion to develop code in the CMU Sphinx project,
> https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk
>
> This project spans unix/linux machines and Windows versions. The Windows
> versions usually use Cygwin to work in a linux style environment. Some
> of the Cygwin development tools need linux line endings.

Note: Cygwin is not Windows! This means that svn behaves differently depending
on whether you install the Cygwin version or the MS Windows version. Further,
even Cygwin itself can be configured differently, in particular concerning
the line endings, so that's another thing to look at.

> Things were working fine until recently -- don't know exactly when. Now,
> Tortoise has taken to changing the original LF to the Windows CRLF, even
> if I intend to use it in the Cygwin environment. This has caused many
> errors, and it took me a while to trace it back to subversion.

Yep, user error. ;)

> Is there any way to preserve original line endings, even if downloading
> it to Windows?

SVN does so by default, you have to explicitly tell it to mess with the line
endings, see the mentioned svn:eol-style property. Also take a look at
your "autoprops", which may or may not be appropriate for your project. A
third option to look at would be pre-commit hooks that check for proper line
endings.

> Also, I want line endings to be significant when
> comparing with previous versions, perhaps with a configurable option.

Take a look at the settings in the diff dialog, you can control how much
whitespace is significant there.

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2677692
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-01 09:15:59 CET

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