On Sun, Aug 29, 2010 at 10:09:50AM +0300, Daniel Hershcovich wrote: > > Hello, > > Please read the following message on stackoverflow.com: > http://stackoverflow.com/questions/3565354/svn-merge-error-merging-trunk-to-branch-and-link-has-been-replaced-with-director > > > Could this be a Subversion bug?
No, it's working as designed. The error message clearly states what needs to be done (remove the offending item, commit, update, then re-run the merge). It's not a nice design, of course. Efforts are being undertaken to fix this problem as part of a complete rewrite of the working copy handling code. The result of which is going to be released in Subversion 1.7. Stefan
