Switching a working copy to a branch where a locally modified file does not exist, and switch back to the original branch (without further changes) leaves the working copy in an inconsistent state. It is surprisingly difficult to recover from that situation. It seems that you have to delete the parent of the parent directory of the affected file.
Is this a known issue? -- Florian Weimer <fwei...@bfk.de> BFK edv-consulting GmbH http://www.bfk.de/ Kriegsstraße 100 tel: +49-721-96201-1 D-76133 Karlsruhe fax: +49-721-96201-99