I did a switch from a svn branch to the trunk using IDEA. Some file had a lock error (whatever that means), I had to perform a clean-up in order to be able to continue and then I did the update/switch again. Although the update finishes OK (or so IDEA tells me), there are files/dirs left behind that are not switched to the new location. They are shown with a blueish colour in the project tree (and inspecting the .svn dir content shows they're still on the branch). At this point it seems like there's no way I can correct the problem through an update, without deleting the directory first.