> The only remaining problem is that some files have occurrences of $Id$,
> $Revision$ and $Date$, which SVN would replace on the fly but git does
> not. Not sure what to do with them, replace them with something git
> supports (not sure that exists?), or discard them.

Discard them, I'd say. You have all the history on your disk, so you
have all the information from there.