[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.71 and 1.72

version 1.71, 2006/06/07 07:01:12 version 1.72, 2006/06/13 06:51:32
Line 86 
Line 86 
         argv += optind;          argv += optind;
   
         if (logmsg == NULL)          if (logmsg == NULL)
                 fatal("please use -m to specify a log message for now");                  fatal("please use -m or -F to specify a log message for now");
   
         TAILQ_INIT(&files_affected);          TAILQ_INIT(&files_affected);
         conflicts_found = 0;          conflicts_found = 0;
Line 143 
Line 143 
         }          }
   
         if (cf->file_status == FILE_MERGE ||          if (cf->file_status == FILE_MERGE ||
             cf->file_status == FILE_PATCH) {              cf->file_status == FILE_PATCH ||
               cf->file_status == FILE_CHECKOUT) {
                 cvs_log(LP_ERR, "conflict: %s is not up-to-date",                  cvs_log(LP_ERR, "conflict: %s is not up-to-date",
                     cf->file_path);                      cf->file_path);
                 conflicts_found++;                  conflicts_found++;
Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72