Description
It seems that on svn 1.7.1 deleted symbolic links on a branch cause a tree conflict when a –reintegrate merge is done back to trunk. The same merge done with svn 1.6.17 smoothly passes as a normal deletion. See below a simple “script” to replicate the bug: # svn, version 1.7.1 (r1186859) REPO=${HOME}/TestRepo svnadmin create $REPO svn mkdir -m "init" file://$REPO/trunk file://$REPO/branches svn co file://$REPO wc touch wc/trunk/file ln -s file wc/trunk/link svn add wc/trunk/file wc/trunk/link svn ci -m "link" wc svn cp -m "branch 1.0" file://$REPO/trunk file://$REPO/branches/1.0 svn up wc svn rm wc/branches/1.0/link svn ci -m "rm link" wc svn merge --reintegrate ^/branches/1.0 wc/trunk --- Merging differences between repository URLs into 'wc/trunk': C wc/trunk/link --- Recording mergeinfo for merge between repository URLs into 'wc/trunk': U wc/trunk Summary of conflicts: Tree conflicts: 1 The same when executed with svn, version 1.6.17 (r1128011) #Only the last command differs svn merge --reintegrate ^/branches/1.0 wc/trunk --- Merging differences between repository URLs into 'wc/trunk': D wc/trunk/link
http://article.gmane.org/gmane.comp.version-control.subversion.user/107545
Original issue reported by kriconet