=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v retrieving revision 1.53 retrieving revision 1.54 diff -c -r1.53 -r1.54 *** src/usr.bin/cvs/commit.c 2006/04/01 20:11:25 1.53 --- src/usr.bin/cvs/commit.c 2006/04/14 02:45:35 1.54 *************** *** 1,4 **** ! /* $OpenBSD: commit.c,v 1.53 2006/04/01 20:11:25 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: commit.c,v 1.54 2006/04/14 02:45:35 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. *************** *** 92,98 **** } } ! if ((cvs_msg != NULL) && (mfile != NULL)) { cvs_log(LP_ERR, "the -F and -m flags are mutually exclusive"); return (CVS_EX_USAGE); } --- 92,98 ---- } } ! if (cvs_msg != NULL && mfile != NULL) { cvs_log(LP_ERR, "the -F and -m flags are mutually exclusive"); return (CVS_EX_USAGE); } *************** *** 201,207 **** CVSFILE *copy; struct cvs_flist *clp = (struct cvs_flist *)arg; ! if ((cf->cf_type == DT_REG) && (cf->cf_cvstat == wantedstatus)) { copy = cvs_file_copy(cf); if (copy == NULL) return (CVS_EX_DATA); --- 201,207 ---- CVSFILE *copy; struct cvs_flist *clp = (struct cvs_flist *)arg; ! if (cf->cf_type == DT_REG && cf->cf_cvstat == wantedstatus) { copy = cvs_file_copy(cf); if (copy == NULL) return (CVS_EX_DATA); *************** *** 234,242 **** cvs_file_getpath(cf, fpath, sizeof(fpath)); ! if ((cf->cf_cvstat == CVS_FST_ADDED) || ! (cf->cf_cvstat == CVS_FST_MODIFIED) || ! (cf->cf_cvstat == CVS_FST_REMOVED)) { cvs_sendentry(root, cf); /* if it's removed, don't bother sending a --- 234,242 ---- cvs_file_getpath(cf, fpath, sizeof(fpath)); ! if (cf->cf_cvstat == CVS_FST_ADDED || ! cf->cf_cvstat == CVS_FST_MODIFIED || ! cf->cf_cvstat == CVS_FST_REMOVED) { cvs_sendentry(root, cf); /* if it's removed, don't bother sending a