Try to be better about dealing with nested repos of different types.

The current test for svn requires 1.7+ to produce anything sensible.