svn merge --dry-run -r BASE:HEAD .
alias svnupdry='svn merge --dry-run -r BASE:HEAD .'