[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.120 and 1.121

version 1.120, 2008/02/04 18:23:58 version 1.121, 2008/02/06 12:42:46
Line 445 
Line 445 
         time_t now;          time_t now;
         CVSENTRIES *entlist;          CVSENTRIES *entlist;
         char *entry, revbuf[CVS_REV_BUFSZ], timebuf[CVS_TIME_BUFSZ];          char *entry, revbuf[CVS_REV_BUFSZ], timebuf[CVS_TIME_BUFSZ];
           char sticky[CVS_ENT_MAXLINELEN];
   
         cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path);          cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path);
   
Line 454 
Line 455 
   
         rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));          rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
   
           sticky[0] = '\0';
           if (cf->file_ent->ce_tag != NULL)
                   (void)xsnprintf(sticky, sizeof(sticky), "T%s",
                       cf->file_ent->ce_tag);
   
         entry = xmalloc(CVS_ENT_MAXLINELEN);          entry = xmalloc(CVS_ENT_MAXLINELEN);
         (void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/%s",          (void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/%s",
             cf->file_name, revbuf, timebuf, cf->file_ent->ce_opts ? : "",              cf->file_name, revbuf, timebuf, cf->file_ent->ce_opts ? : "",
             cf->file_ent->ce_tag ? : "");              sticky);
   
         entlist = cvs_ent_open(cf->file_wd);          entlist = cvs_ent_open(cf->file_wd);
         cvs_ent_add(entlist, entry);          cvs_ent_add(entlist, entry);
Legend:
Removed from v.1.120  
changed lines
  Added in v.1.121