Hello,
I still have still issues with fixed issue:
#3486 ("svn: Attempt to add tree conflict that already exists")See attached script for provoking this error. Same results with webdav except you get additional error: svn: Attempt to add tree conflict that already exists at 'dir\foo.c' svn: Error reading spooled REPORT request response I used subversion 1.6.13 on windows (script should be easily adapted to unix(change line 2 and 8)) Biggest problem is the bail out on merge leaving all other merges unprocessed. Best regards, Peter
@rem config SET REPO_PATH=file:///c:/tmp/treeconflict/repo @rem end config @REM rmdir /S /Q repo wc svnadmin create repo svn co %REPO_PATH% wc pushd wc mkdir Server\trunk\dir echo x >> Server\trunk\dir\foo.c echo x >> Server\trunk\dir\bar.c svn add Server svn commit -m "1" svn move Server Source svn commit -m "2" mkdir Source\branches svn add Source\branches svn commit -m "3" svn copy Source\trunk Source\branches\3.0 svn commit -m "4" svn delete Source\trunk\dir\foo.c svn commit -m "5" @rem few checkins echo xxx >> Source\branches\3.0\dir\foo.c svn commit -m "6" echo xxx >> Source\branches\3.0\dir\bar.c svn commit -m "7" @rem merge down bar.c only pushd Source\trunk @rem wtf - 6:7 is exclusive on the left side? -r 7 or -r 7:7 does nothing svn merge ^^/Source/branches/3.0 -r 6:7 svn up svn commit -m "8" popd echo xxx >> Source\branches\3.0\dir\foo.c svn commit -m "9" pushd Source\trunk svn merge ^^/Source/branches/3.0 -r5:9 popd popd
