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

Re: diff handles addition on line end funny sometimes

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 18 May 2009 17:55:51 +0200

David Balažic wrote:
> Stefan Küng wrote:
>> David Balažic wrote:
>>> Hi!
>>>
>>> I noticed this in both v1.5.9 and v1.6.2. (on WinXP Pro SP3)
>>>
>>> If I a change a file in the WC, by adding text to the line end,
>>> then sometimes the diff display (TortoiseMerge window)
>>> shows the entire line as "added" and the old line as
>> "removed" (yellow and
>>> "pale" yellow colors).
>>>
>>> Sometimes it shows it correctly ("correctly" in my opinion):
>>> the line on both left and right is colored pale blue and the
>>> added text is colored in yet another nuance of yellow
>> ("Inline / Added").
>
> ...
>
>> It depends on how similar the two lines are. If there are too many
>> changes, TMerge shows the lines as added/removed. Only if
>> there are few
>> changes it shows the line as blue and those few changes inline.
>
> Can this be tweaked ?

No.

> I understand that if every second character changes, then it
> is considered removed/added, but in the case above it is clearly
> an addition of text at the end of otherwise unchanged line.

- virtual int Stop();
+ virtual int Stop();///< fgrg g r g

*you* can recognize that there's something added at the end. But not an
algorithm. Because it doesn't know that "virtual int Stop();" is the
important part of that line. Imagine the following change:

- word1 word2 word3word4
+ word1 word2 word3word5 word6 word7 word8 word9

Would you consider this a small change? I wouldn't - even if it's only a
change at the end.

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

Received on 2009-05-18 17:56:06 CEST

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