roll back commit

svn merge -r2:1 . .

BASH