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

Re: TortoiseMerge inline diff coloring issue

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 22 Apr 2015 20:30:54 +0200

On 22.04.2015 19:04, Tobias Kaes wrote:
> Hi, I've got some diff coloring issue with TMerge (updated to the latest version 1.8.11 and the issue persists)
>
> I've got two files where within a line two words have been swapped: "dead tree" has been changed to "tree dead" (sample files + screenshot attached)
>
> TMerge colors "tree" in the first line red and "dead" in the second line as yellow. Reading the red one as 'removed' and yellow as 'inserted' this does not make sense, as the result would have to be "dead dead" and not "tree dead".

While not exactly what you would expect, it's actually correct.
TMerge and the underlying diffing engine does not recognize
swaps/exchanges but only adds and removes.

What you see is that on the left side, the word "tree" is missing before
"dead", indicated by the red vertical line. Then the word "dead" is
unchanged, and after "dead" the word "tree" is being removed.
On the right side, the word "dead" is missing before "tree", and the
word "dead" is added after "tree".

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=3114145
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-22 20:30:47 CEST

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