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