RE: Re: Getting merge to ignore a directory in source and destination branch for a merge (tree conflict)
From: Jonathan <jawolter_at_gmail.com>
Date: Wed, 23 Sep 2009 07:15:27 -0700 (PDT)
I'm working with paul. Here is a patch of what we hacked svn 1.6.x with.
The difference is we are effectively undoing this change: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/tree_conflicts.c?r1=34854&r2=34860
In our patch, when you have an existing tree conflict, and you try to add another tree conflict on top of it, there will be a verbose warning of the new and existing conflicts, but it will not return. The merge continues.
We reviewed the files affected by this double tree-conflict merge and it turned out that almost all of them resulted in a net delete. (In the HEAD version we're merging to they were deleted).
Please take a look at the patch, if you think it would help you diagnose what we're doing. Do you folks see any unintentional side affects this might cause?
This is an archived mail posted to the Subversion Users mailing list.