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

incorrect diff / merge

From: Brannon King <notacommie_at_gmail.com>
Date: 2007-03-29 18:05:18 CEST

I was informed from the TortoiseSVN mailing list that I need to post this
problem here. The following two examples don't diff correctly (in my
opinion). The "if" statement on the bottom should take priority over the
indentation of the braces. Is there some setting I could tweak to improve
the performance of the diff tool for code like this?

File 1:
if(a){
        b
        c
        d
        e
        while(f){
                if(g)
                        break;
        }
        if(g && h && i)
                return
}

File 2:
lock(sr){
        if(a){
                b
                c
                d
                e
                while(f){
                        if(g && h && i)
                                break;
                }
                if(g && h && i)
                        return
        }
}

Thanks for your time,
Brannon

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 29 18:05:50 2007

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

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