Status "missing, tree conflict"

I've got my system into a mess. Whenever I say "check for modifications" it tells me that one file has status "missing, tree conflict". This is, I think, a file I (stupidly) renamed using Windows Explorer, not using Tortoise SVN. The file (with its new name) shows up with a tick on it. The file with its old name does not exist in the working directory, but it must still exist in the repository somewhere. If I do a Commit, it tells me it's completed successfully, but the icons on the folders in Windows Explorer show a "caution" sign (exclamation mark). I've tried Clean Up, but it didn't help.

How do I sort this out without losing any history (log) or changes?

I don't really understand what SVN stores where - it would help to have a better understanding of this... Then maybe I could fix problems like this by manually changing things.

Thanks - Rowan

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2831606

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-28 17:48:41 CEST