svn merge -r30:HEAD <svn branch path>