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

2016-02-19 21:16 GMT+01:00 Stefan Küng:
> 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.
>

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
Subversion 1.8.11, -release
apr 1.5.1
apr-util 1.5.4
serf 1.3.8
OpenSSL 1.0.1j 15 Oct 2014
zlib 1.2.8

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):

​Best regards,
Ondrej
​

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3162320

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].