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

TortoiseMerge diff oddity

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-06-30 01:31:18 CEST

Hi Stefan,

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Fri Jun 30 01:30:44 2006

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

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