rm -rf repo wc svnadmin create repo svn co file://`pwd`/repo wc cd wc svn mkdir trunk echo Hello World > trunk/sample.txt svn add trunk/sample.txt svn commit -m "" svn cp trunk branch svn commit -m "" svn rm branch/sample.txt svn commit -m "" svn merge -r2:3 branch trunk svn revert -R . echo Local mods > trunk/sample.txt svn merge -r2:3 branch trunk svn commit -m ""