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

Re: Character matching bug in TortoiseMerge 1.4.8, Build 12137 - 32 Bit, 2008/02/16 11:09:38

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 23 May 2008 17:09:07 +0200

Matthias.Klaey_at_mt.com wrote:
> Dear all
>
> I've just noticed a character matching bug in TortoiseMerge when
> executing the following command:
>
> <<Command.png>>
>
> When calling diff, I expect that a true diff is executed. This perfectly
> works for line 5..27* but unfortunately it doesn't properly work for
> lines 1..4*, i.e. character diff is not shown:

There are too many inline changes in those lines. That's why the inline
diff is not shown but TMerge assumed that the lines are completely
different. It would look *really* ugly if TMerge would show inline diffs
when the lines have too many changes.

Stefan

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

Received on 2008-05-23 17:09:21 CEST

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