[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: Fri, 19 Feb 2016 21:16:25 +0100

On 19.02.2016 15:05, Ondrej Chylik wrote:
> Hello everybody,
>
> when using TortoiseMerge Diff to see changes done in a file in a
> revision, I realized that wrong content is shown. Instead of one long
> line in the file, the diff view shows the previous line of text again.
>
> *Simple steps to reproduce the problem:*
> 1. Have a short file of couple of lines, one of which is rather long -
> example.xml attached
> 2. Have another copy of the file and select the two files for comparison
> using TortoiseSVN > Diff
>
> *Expected result:*
> Correct content of the files is shown, like here (screenshot from
> another comparison tool):
>
>
> *​Actual result:
> *
>
> ​You see the long line is completely absent and instead the preceding
> line is shown twice.
> Same situation when opening the compare view from the Log Messages view,
> regardless whether there are or aren't any actual differences among the
> files.
>
> I consider this a serious issue, because it prevents from successfully
> and reliably reviewing the changes in files in the repository.
>
> *My ToroiseSVN Version Information:*
> TortoiseSVN 1.9.3, Build 27038 - 64 Bit , 2015/12/13 11:53:16
> Subversion 1.9.3, -release
> apr 1.5.2
> apr-util 1.5.4
> serf 1.3.8
> OpenSSL 1.0.2e 3 Dec 2015
> zlib 1.2.8
> SQLite 3.9.2
>
> Can anybody please confirm this is a bug or advise me otherwise?

Using the file you sent, I get a correct view.
See attached screenshot.

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=3161808
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

tmerge-diff.png
Received on 2016-02-19 21:16:23 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.