[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us