[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.113 and 1.114

version 1.113, 2007/09/24 13:56:09 version 1.114, 2007/10/03 13:12:06
Line 289 
Line 289 
         crev = NULL;          crev = NULL;
         rrev = NULL;          rrev = NULL;
   
           if (cf->file_rcs->rf_branch != NULL) {
                   rcsnum_free(cf->file_rcs->rf_branch);
                   cf->file_rcs->rf_branch = NULL;
           }
   
         if (cf->file_status == FILE_MODIFIED ||          if (cf->file_status == FILE_MODIFIED ||
             cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED              cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
             && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {              && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {
Line 416 
Line 421 
         if (cf->file_status == FILE_REMOVED) {          if (cf->file_status == FILE_REMOVED) {
                 if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)                  if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
                         fatal("cvs_commit_local: failed to set state");                          fatal("cvs_commit_local: failed to set state");
         }  
   
         if (cf->file_rcs->rf_branch != NULL) {  
                 rcsnum_free(cf->file_rcs->rf_branch);  
                 cf->file_rcs->rf_branch = NULL;  
         }          }
   
         if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {          if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
Legend:
Removed from v.1.113  
changed lines
  Added in v.1.114