Please don't merge all the stupid prop changes for paths unrelated to your merge. I know svn likes to add them, but it makes it annoying to review.
$ cat /home/catrope/bin/svnsucks #! /bin/bash svn st | grep '^ M' | awk '{print $2}' | xargs svn revert $