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

Re: TortoiseMerge diff oddity

From: Torben Nehmer <torben-spam-gmane_at_nehmer.net>
Date: 2006-07-04 15:41:28 CEST


Simon Large <simon <at> skirridsystems.co.uk> writes:

> I just did a diff on TortoiseMerge.pot before committing in r6953 and
> there are differences possibly due to encoding which only half show up.
> If I use the next-diff button I get to line 29 which changes the
> spelling of your name (on my PC anyway). Line 33 does the same for
> Lübbe. But those lines have no '+' and '-' in the margin to indicate a
> change. The locator bar shows those lines in white when you next-diff to
> get there. Dragging the slider on the locator bar doesn't show them at all.
> Looking at the commit email, the only thing to change in that file seems
> to be the pot creation date line (line 4). Maybe it's because that date
> line contains UTF-8 chars when the date is in German.
> I'm not sure there is a good way to handle the auto-detection of UTF-8
> to make the display consistent, but I don't think TMerge should be
> including the unchanged lines in its diff list.

I can confirm this behavoir. It doesn't happen every time, btw. in some cases
TMerge doesn't recognize the files as UTF-8 and everything is fine.

I recommend making charset heuristics optional, as they will always be error-

If you need a file to test with, plus a few diffs that trigger various
different results, please send me a mail to torben <at> nehmer <dot> net, I'm
no subscriber of this list.

Otherwise please keep up the great work you did :)

Live long and prosper,
Torben Nehmer

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 4 16:23:25 2006

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