Revert "Revert "treat first component serially to avoid problems with some svn versions""

This reverts commit 87095b1d6117563f4d1ced97c59a3bad9376cf95, and with
that essentially reinstates c1c0f5f28d2cfe9d2003cf1356d933d260e8200a.