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

Re: svn merge produced conflict with bad merge

From: Kevin Ballard <kevin_at_sb.org>
Date: 2004-08-11 21:57:43 CEST

I'm not sure what you want. There's a couple of lines changed below
there as well, but that's outside the conflict area (because my working
copy was identical to the merge-left file on those lines).

If you want I'd be happy to send you the files in question. In fact,
they're available publicly so I could tell you how to reproduce it
yourself if you want.

        # Check out revision 216 of the branch - this is before my merge of
r211:217
        svn checkout -r 216 http://svn01.23i.net/growl/branches/resizable
        
        # Merge r211:217 from trunk into this branch (on the file in question)
        svn merge -r 211:217
http://svn01.23i.net/growl/trunk/KABubbleWindowView.m
KABubbleWindowView.m

After that merge the file KABubbleWindowView.m will have a conflict.
Feel free to examine it. Now do the following:

        # Revert back to the branch r216
        svn revert KABubbleWindowView.m
        
        # Merge again using the built-in diff3
        svn merge --diff3-cmd /usr/bin/diff3 -r 211:217
http://svn01.23i.net/growl/trunk/KABubbleWindowView.m
KABubbleWindowView.m

Now you'll see that it merged successfully with no conflicts (and
compiles and runs just fine).

On Aug 11, 2004, at 3:49 PM, Max Bowsher wrote:

> Is there more context beyond what you are showing us?
>
> I took the left, right, and working versions you quoted in your
> previous
> mail, and had subversion perform a merge, and it did so without
> conflict,
> and correctly.

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

  • application/pkcs7-signature attachment: smime.p7s
Received on Wed Aug 11 21:58:10 2004

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