Re: Bug: TortoiseMerge _almost_ handles Mac end of line. ;-)

Nick Westgate wrote:
> Hi.

Hi,

> TMerge detects CRLF (Win), LF (*nix), CR (Mac) end of lines in
> method CFileTextLines::CheckLineEndings(), and even supports
> writing the correct line endings in CFileTextLines::Save().
>
> Unfortunately, files are read using CStdioFile::ReadString()
> which handles CRLF, LF but not CR. If files were read manually
> then it looks like Mac files would 'just work'!
>
> Please help end the bloodshed. Spaces, tabs, CR, LF ...
> Why can't we all just get along. ;-)

You could set 'svn:eol-style' to 'native' on text files. That way, each file
gets the appropriate line endings for the system you do the checkout and you do
not have to worry about them.

And using CR as line endings is not very common any more, since only the old Mac
OS 9 and below used that. Mac OS X uses LF as far as I know.

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 28 14:06:29 2006