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

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

version 1.90, 2009/02/21 12:47:19 version 1.91, 2009/02/21 14:50:53
Line 134 
Line 134 
                 return;                  return;
         }          }
   
         if (cf->file_status == FILE_UPTODATE && cf->fd == -1 &&          if (cf->file_status == FILE_UPTODATE &&
               !(cf->file_flags & FILE_ON_DISK) &&
             !(cf->file_flags & FILE_USER_SUPPLIED))              !(cf->file_flags & FILE_USER_SUPPLIED))
                 return;                  return;
   
Line 154 
Line 155 
             cf->file_ent->ce_conflict != NULL)              cf->file_ent->ce_conflict != NULL)
                 status = "File had conflicts on merge";                  status = "File had conflicts on merge";
   
         if (cf->fd == -1) {          if (!(cf->file_flags & FILE_ON_DISK)) {
                 (void)xsnprintf(buf, sizeof(buf), "no file %s\t",                  (void)xsnprintf(buf, sizeof(buf), "no file %s\t",
                     cf->file_name);                      cf->file_name);
         } else          } else
Legend:
Removed from v.1.90  
changed lines
  Added in v.1.91