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

Re: TortoiseMerge bug: Diff showing a duplicate of previous line instead of the correct (long) line content

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 22 Feb 2016 21:33:30 +0100

On 22.02.2016 16:04, Ondrej Chylik wrote:

> Hello Stefan and thanks a lot for looking into the issue.
>
> The problem is 100% reproducible for me on the file and its version
> history. I had my colleague try the same with her rather old version of
> TortoiseSVN:
> TortoiseSVN 1.8.10, Build 26129 - 64 Bit , 2014/12/17 19:35:51
>
> And she saw exactly the same issue as I did.
>
> On the other hand, another colleague that has the exact same version as
> I do (latest, 1.9.3, see quoted above), does not seem to observe the
> problem.
>
> Any clues what may be influencing this behavior?
>
> The only difference in settings I noted on your screenshot is that you
> had "Show Whitespaces" on and I didn't, so I tried again with that
> setting. The problem stays, but what might be interesting is the
> irregular whitespace dots it shows throughout the wrongly displayed line
> (screenshot follows):

On your screenshot, the lines shown at the bottom (the line-diff-bar)
show a lot of dots on the right of the shown text. That indicates that
there actually *is* something which should be shown but isn't shown or
at least not shown correctly.

I can only speculate here. But if such a huge bug was in TMerge for such
a long time, I'm sure you wouldn't be the first one to notice it - it
would have been reported a very long time ago.

So, as for speculation:
maybe your graphics driver/card has a bug and doesn't show the lines
correctly. The fact that the line 4 is shown twice instead of the very
long line 5 could be because of caching of the graphics driver.

Another possibility (but unlikely) may be the language settings on your
OS: the file is read in the local codepage (indicated by "ANSI" in the
status bar of TMerge). But that shouldn't make the line disappear but
lead to '?' chars shown instead where the file parsing would fail.
As I said: unlikely.

That's all I have for ideas on why this would happen...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3162384
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-02-22 21:33:18 CET

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.