Re: Getting merge to ignore a directory in source and destination branch for a merge (tree conflict)

On Wed, Sep 23, 2009 at 09:36:30AM -0500, Paul Hammant wrote:
> We're not expecting the Svn team to consume this patch as is.
>
> It is just that we are likely to rely on this for our long-delayed
> merge from trunk to branch.
>
> There are two parts to this - better debugging output for a subset of
> tree-conflict situations and not halting early if it encounters this
> specific tree-conflict situation.
>
> Great work Jon (and Addison and Tim and others).

Paul,

the 1.6.x-r38000 branch has now been re-integrated into the 1.6.x
branch, and has been deleted.

I have reason to believe that svn 1.6.x (and trunk) should now never
try to add a tree conflict twice, i.e. your problem should really
be fixed now.

Can you please try to reproduce your problem again with a fresh
build from latest 1.6.x and confirm it fixed? That would be much
appreciated!

Thanks,
Stefan

-- 
printf("Eh???/n");
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2402262
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].