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

Bug Report: TortoiseMerge knows no Mac line breaks

From: André Koschmieder <a.koschmieder_at_gmx.de>
Date: 2006-06-07 01:13:34 CEST

Hi,

I noticed that the Diff function of TortoiseSVN has a problem when comparing
files that are saved in the Mac Style, that is with only \r (CR) as new line
symbol.
The line breakes are ignored, and the file is displayed as one single line,
which makes the diff function useless. Instead of line breaks, there are
square symbols in the file, like when you open a UNIX file in the Windows
notepad.
The problem does not occur when using the UNIX (\n, LF) or Windows (\r\n,
CRLF) line breaks. If I mix them in a file, all CR line breaks are ignored
but the others are displayed properly.

I couldn't find anything on that subject in the bug tracker or in the
mailing list, so I wonder if I am the only one having this problem.

Technical details:
TortoiseMerge 1.3.4, Build 6692 - 32 Bit
libsvn_diff 1.3.2,
apr 0.9.7
apr-iconv 0.9.7
apr-utils 0.9.7

The problem appears on my Windows XP installation, and also on a Mac
installation I tried. It happens in every diff I tried; comparing local
changes to the last version checked in, or comparing old versions in the
repository.
Do you need any more information to reproduce this?
Please also reply directly to me, for I'm not subscribed.

Cheers
André

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jun 7 02:31:35 2006

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

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