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

Re: Line diff handled badly (by old algorithm)

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-06-06 00:52:14 CEST

Simon Large wrote:
> Hi Stefan,
>
> You asked for an example of the old line diff algorithm not working
> well. I have seen it several times, but of course I can't find an
> example now. I just made this one up, and it sort of shows the problem:
>
> // pointer to function returning int
> // pointer to function returning pointer to int
>
> Put these in separate files and diff. The line diff highlights show that
> 'int' has changed to 'int' (?) and the 'pointer to' is just marked in
> green because the algorithm already found a match for it.
>
> But of course that's with the old method which I think you just got rid
> of. I've just downloaded a nightly to try out your weekend's work :-)

I like it :-) It has certainly fixed the spurious matching in the old
algorithm.

I'm not sure the line diff algorithm is correct yet though, or at least
the colour coding. Try these 2 lines:

void EventWrite(U8 EventType, U8 Device)
void EventWrite(U8 EventType, U8 Ident)

I get some very odd colour coding rather than a straight delete of
'Device' and an add of 'Ident'.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

DiffColour.png
Received on Tue Jun 6 00:51:37 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.