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

TMerge 'show whitespace changes' - observations and possible issue

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Sat, 23 Apr 2011 17:59:28 -0700 (PDT)

I was converting tabs to whitespace throughout my codebase today and made a
couple of observations when reviewing changes.

1. Tabs are shown as having varying length:

Here are two lines from a diff viewed in vim with `:set list` on:

mxaParams, parentName, "EstimationType" ) );$

mxaParams, parentName, "Direction" ) );$

Here is the view on the lhs of TMerge:


Why are the single tab characters displayed as having length 1 and 2 spaces,

 2. In the previous example, 'Ignore whitespace changes' was selected. I'm
seeing several cases were the only changes are tab -> whitespace conversions
and these are displayed as changes in the viewer. However these are
*usually* ignored when 'Ignore whitespace changes' is selected.

The 'ignore' setting does not have an affect when the tab to whitespace
changes are not at the beginning of the line. In (1), there are tab to
whitespace changes in the middle of the line. Here is another example where
the tab to whitespace changes are at the end of the line.

 -^I^Iconst bool axisIsVisibleY = mxGetPropertyAsBool( mxDisplay,
parentName, "AxisIsVisibleY", i );^I^I $

TMerge lhs:

TMerge rhs:

 3. Here is another case where the one of the displayed tabs is shown as
having width of 2 spaces and the other is shown as having a width of 4

 -^I^Iconst int pixelGridIndex = mxGetPropertyAsInt( mxDisplay, parentName,
"PixelGridNum", i ) - 1;^I^I$


I could probably put together some batch files that reproduce these issues,
if that would be of help. I might even have time to work on a patch if
someone else doesn't jump on this and immediately fix the issues.

I have a build installed from just a day or two back:


View this message in context: http://old.nabble.com/TMerge-%27show-whitespace-changes%27---observations-and-possible-issue-tp31463769p31463769.html
Sent from the tortoisesvn - dev mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-24 02:59:32 CEST

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