Re: We're still going on 'tree conflict' issue

> The fix is present on the not-yet-released 1.6.x-r38000 branch only.

My findings completely confirm that. 1.6.x straight up still bails out,
1.6.x-r38000 completes the merge in the same verbose way as the /trunk
version does.

The actual conflict that wrecks the merge for us is a "file replace" being
merged in. But as explained in another thread recently, a "replace" really is
a facade for a "delete" followed by an "add". Thus I guess that is why there
are two tree conflicts on the same item in a single merge.

The wretched thing about this particular "file replace" is that it replaces
the file by a copy of a copy of a previous revision of itself. No content
change whatsoever. Somehow this silly change came about and got committed.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396473
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].