Re: svn merge produced conflict with bad merge

On Aug 11, 2004, at 3:14 PM, Ben Collins-Sussman wrote:

> An interesting experiment would be for Kevin to repeat the update using
> '-diff3-cmd' argument: see if GNU diff3 gives significantly different
> results.

Ok, I just did. And the built-in /usr/bin/diff3 worked perfectly. No
conflicts.

Subversion's diff3:
<<<<<<< .working
        [_title drawAtPoint:NSMakePoint( 55., heightOffset - 15. )
withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[NSFont
boldSystemFontOfSize:13.], NSFontAttributeName, [NSColor
controlTextColor], NSForegroundColorAttributeName, nil]];
        [_text drawInRect:NSMakeRect( 55., 10., 200., heightOffset - 25. )];

        if( [_icon size].width > 32. || [_icon size].height > 32. ) { //
Assume a square image.
=======
        NSSize iconSize = [_icon size];
        if( iconSize.width > 32. || iconSize.height > 32. ) { // Assume a
square image.
                NSRect newBounds = { { 0., 0. }, { 32., 32.} };
>>>>>>> .merge-right.r217
                NSImageRep *sourceImageRep = [_icon bestRepresentationForDevice:nil];

/usr/bin/diff3:
        [_title drawAtPoint:NSMakePoint( 55., heightOffset - 15. )
withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[NSFont
boldSystemFontOfSize:13.], NSFontAttributeName, [NSColor
controlTextColor], NSForegroundColorAttributeName, nil]];
        [_text drawInRect:NSMakeRect( 55., 10., 200., heightOffset - 25. )];

        if( [_icon size].width > 32. || [_icon size].height > 32. ) { //
Assume a square image.
                NSImageRep *sourceImageRep = [_icon bestRepresentationForDevice:nil];

No conflicts, and it's merged the way it should be.

-- 
Kevin Ballard
kevin@sb.org
http://www.tildesoft.com
http://kevin.sb.org