Re: incorrect diff / merge

Brannon King wrote:
> 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?

[snip code fragments]

You'll have to be a little more detailed about your problem. What
command are you running to get the diff? What are you getting back?
What are you *expecting* back?

The difference between those two fragments would usually (AKA as shown
by diff -u) show up as a complete removal of the first block, followed
by an addition of the whole second block. If that's not what you're
diffing, you'll need to tell us.

-kgd

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