The first patch improves svn detection. The second is a fix required for the svn-sink test because svn 1.5 changed the whitespace in output for a command the test checks.