[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: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Fri, 5 Oct 2012 09:10:08 +0100

On 4 October 2012 18:30, Sergey Azarkevich <azarkevich_at_gmail.com> wrote:
> thanks for clarification - but I still found the behavior of the diff
> algorithm strange in some way.
>>
>> I give you an example...
>>
>>
> Just my two cents...
>
> I found that TortoiseMerge from TortoiseGit:
>
> TortoiseMerge 1.7.6, Build 0 - 64 Bit, Dec 10 2011
> libsvn_diff 1.6.1, -dev
> apr 1.4.5
> apr-utils 1.3.12
>
> show lines 1303, 1304 .. continuously. Seems, like Andreas Ländle expect.
>
> While TortoisseMerge from TortoiseSVN:
>
> TortoiseMerge 1.7.9, Build 23248 - 64 Bit , 2012/08/30 18:25:37
> libsvn_diff 1.7.6,
> apr 1.4.6
> apr-utils 1.3.12
>
> break after line 1303

As Stefan said, the diff engine is part of Subversion and here TGit is
using SVN 1.6.1 and TSVN is using SVN 1.7.6

Simon

-- 
:       ___
:  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=3013590
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-10-05 10:10:13 CEST

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