[BACK]Return to commit.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/commit.c between version 1.53 and 1.54

version 1.53, 2006/04/01 20:11:25 version 1.54, 2006/04/14 02:45:35
Line 92 
Line 92 
                 }                  }
         }          }
   
         if ((cvs_msg != NULL) && (mfile != NULL)) {          if (cvs_msg != NULL && mfile != NULL) {
                 cvs_log(LP_ERR, "the -F and -m flags are mutually exclusive");                  cvs_log(LP_ERR, "the -F and -m flags are mutually exclusive");
                 return (CVS_EX_USAGE);                  return (CVS_EX_USAGE);
         }          }
Line 201 
Line 201 
         CVSFILE *copy;          CVSFILE *copy;
         struct cvs_flist *clp = (struct cvs_flist *)arg;          struct cvs_flist *clp = (struct cvs_flist *)arg;
   
         if ((cf->cf_type == DT_REG) && (cf->cf_cvstat == wantedstatus)) {          if (cf->cf_type == DT_REG && cf->cf_cvstat == wantedstatus) {
                 copy = cvs_file_copy(cf);                  copy = cvs_file_copy(cf);
                 if (copy == NULL)                  if (copy == NULL)
                         return (CVS_EX_DATA);                          return (CVS_EX_DATA);
Line 234 
Line 234 
   
         cvs_file_getpath(cf, fpath, sizeof(fpath));          cvs_file_getpath(cf, fpath, sizeof(fpath));
   
         if ((cf->cf_cvstat == CVS_FST_ADDED) ||          if (cf->cf_cvstat == CVS_FST_ADDED ||
             (cf->cf_cvstat == CVS_FST_MODIFIED) ||              cf->cf_cvstat == CVS_FST_MODIFIED ||
             (cf->cf_cvstat == CVS_FST_REMOVED)) {              cf->cf_cvstat == CVS_FST_REMOVED) {
                 cvs_sendentry(root, cf);                  cvs_sendentry(root, cf);
   
                 /* if it's removed, don't bother sending a                  /* if it's removed, don't bother sending a
Legend:
Removed from v.1.53  
changed lines
  Added in v.1.54