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

Re: Problem/bug with TortoiseMerge 1.7.9 b23248 64-bit libsvn_diff 1.7.6

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 02 Oct 2012 20:10:15 +0200

On 02.10.2012 11:58, Andreas Ländle wrote:
> Hello,
>
> if you compare the two attached files and Take a look at the last
> difference (starting the line that follows line 1303 in list-signed.txt
> - line 3193+ in list-signed-all.txt). What seems really strange to me is
> the fact that this is reported although line 1304 of list-signed.txt is
> identical to the line 3194 of list-signed-all.txt! What I would expect
> is that, because we read from top to down, differences in the files are
> detected as close to the bottom of the document as possible.
>
> For now the position of the last difference seems to be chosen arbitrary ;-)

the diff algorithm tries to find the closest matches. That doesn't mean
it detects them as close to the bottom as possible but as close to the
difference it detects.
That's how the diff in the svn library works, and we use those diff
functions.

Also, you have some encoding problems in list-signed-all.txt: it isn't
proper utf8 and therefore read as ANSI, which results in more diff
blocks than necessary.

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=3011694
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-10-02 20:10:24 CEST

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