Re: TMerge 'show whitespace changes' - observations and possible issue

On 2011-04-24 02:59, Ryan J Ollos wrote:
> 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:
>
> Why are the single tab characters displayed as having length 1 and 2 spaces,
> respectively?
I would say to mimic typewriter tabulator. Let say you have tab width 4.
Than tab can stop only after each forth char. This makes things aligned;
in next example all a would be aligned making tab converting to 4,3,2,1
space

^Ia
/^Ia
//^Ia
///^Ia

>
> 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 have seen this(?); assume you are converting tab to spaces and you
have line where you convert tab on line start to 4 spaces it is white
space only change aka.like line is not gray as expected, however when
you use 5 or 3 spaces it is blue (added)

PLS try if this is what you are facing. You probably convert all tabs
into 4 spaces uncoditionaly (see point 1) and get into this thing.

We have to ask Stefan if this is intended: Stefan, it is ?

> 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
> spaces:
>
> -^I^Iconst int pixelGridIndex = mxGetPropertyAsInt( mxDisplay, parentName,
> "PixelGridNum", i ) - 1;^I^I$
(see point 1)
>
>
>
> 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 would check this too, but I'm rewriting bit code around this - using
cache for icons, wrap lines etc.

For this particular issues batch file is not needed. If you have time to
spend you can try to fix issue 2. Otherwise I hope they get fixed within
month.

-- 
Oto BREZINA, Printflow s.r.o., EU
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2723798
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].