Use cvs update -C to discard any local changes