Fixing drift between CVS and git