I know this is a really old thread but I maintain that:
The easiest and safest method to fix this is to delete your hidden ".svn" folder and check everything out again.
It fixes most problems when svn screws around should keep local changes (marked as "conflicted") when you check out the head revision again.