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

Diff for /src/usr.bin/cvs/update.c between version 1.90 and 1.91

version 1.90, 2007/01/28 02:04:45 version 1.91, 2007/01/28 23:37:29
Line 290 
Line 290 
         flags = 0;          flags = 0;
         cvs_file_classify(cf, tag, 1);          cvs_file_classify(cf, tag, 1);
   
         if (cf->file_status == FILE_UPTODATE && cf->file_ent != NULL &&          if ((cf->file_status == FILE_UPTODATE ||
               cf->file_status == FILE_MODIFIED) && cf->file_ent != NULL &&
             cf->file_ent->ce_tag != NULL && reset_stickies == 1) {              cf->file_ent->ce_tag != NULL && reset_stickies == 1) {
                 cf->file_status = FILE_CHECKOUT;                  if (cf->file_status == FILE_MODIFIED)
                           cf->file_status = FILE_MERGE;
                   else
                           cf->file_status = FILE_CHECKOUT;
                 cf->file_rcsrev = rcs_head_get(cf->file_rcs);                  cf->file_rcsrev = rcs_head_get(cf->file_rcs);
         }          }
   
Legend:
Removed from v.1.90  
changed lines
  Added in v.1.91