You might also try exporting from cvs with a date-stamp from just before the bad import, which will get you a file tree with good files. Then import that back in to cvs. Brute force and maybe confuses the logs a bit, but easier to understand than three-way merges.
