To revert a particular folder in SVN to its previous state I currently use the following:
svn rm folder svn commit -m \'removed folder to revert to previous vers
You can use svn merge for this task, see http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2 for an example
svn merge