rm -rf my_repo rm -rf my_wc REPO=file:///"$PWD"/my_repo svnadmin create my_repo mkdir -p my_wc/trunk mkdir -p my_wc/tags mkdir -p my_wc/branches svn import -m "std layout" my_wc $REPO rm -rf my_wc svn mkdir -m "mkdir bin" $REPO/trunk/bin svn mkdir -m "mkdir proj" $REPO/trunk/proj svn co $REPO my_wc echo rev1 > my_wc/trunk/bin/file svn add my_wc/trunk/bin/file svn propset svn:externals "../bin/file file" my_wc/trunk/proj svn commit -m "svn:externals ../bin/file file" my_wc svn copy -m "branch b1" $REPO/trunk/ $REPO/branches/b1 svn up my_wc echo rev2 >> my_wc/trunk/proj/file svn commit -m "rev2" my_wc svn up my_wc svn merge -c 6 $REPO/trunk/ my_wc/branches/b1 svn up my_wc svn commit -m "merge" my_wc
#fails with: #svn: Commit failed (details follow): #svn: Cannot commit both '/usr/local/src/my_wc/branches/b1/proj/file' and '/usr/local/src/my_wc/branches/b1/bin/file' as they refer to the same URL #svn, version 1.6.9 (r901367)
