update to fix the issue for cvs rlog missing comments and modify merge script for correcting cvs up -r