Fixes #6588: Prevent subversion module from leaving remote in conflict state

Also drops the need for update() and use switch() with --force and auto conflict resolving.