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

Diff for /src/usr.bin/cvs/import.c between version 1.59 and 1.60

version 1.59, 2007/01/11 15:41:42 version 1.60, 2007/01/12 17:25:33
Line 169 
Line 169 
 import_new(struct cvs_file *cf)  import_new(struct cvs_file *cf)
 {  {
         BUF *bp;          BUF *bp;
         char *content;  
         time_t tstamp;          time_t tstamp;
         struct stat st;          struct stat st;
         struct rcs_branch *brp;          struct rcs_branch *brp;
Line 199 
Line 198 
                 fatal("import_new: failed to load %s", cf->file_path);                  fatal("import_new: failed to load %s", cf->file_path);
   
         cvs_buf_putc(bp, '\0');          cvs_buf_putc(bp, '\0');
         content = cvs_buf_release(bp);  
   
         if ((brev = rcsnum_brtorev(branch)) == NULL)          if ((brev = rcsnum_brtorev(branch)) == NULL)
                 fatal("import_new: failed to get first branch revision");                  fatal("import_new: failed to get first branch revision");
Line 236 
Line 234 
         TAILQ_INSERT_TAIL(&(rdp->rd_branches), brp, rb_list);          TAILQ_INSERT_TAIL(&(rdp->rd_branches), brp, rb_list);
   
         if (rcs_deltatext_set(cf->file_rcs,          if (rcs_deltatext_set(cf->file_rcs,
             cf->file_rcs->rf_head, content) == -1)              cf->file_rcs->rf_head, bp) == -1)
                 fatal("import_new: failed to set deltatext");                  fatal("import_new: failed to set deltatext");
   
         rcs_write(cf->file_rcs);          rcs_write(cf->file_rcs);
         cvs_printf("N %s/%s\n", import_repository, cf->file_path);          cvs_printf("N %s/%s\n", import_repository, cf->file_path);
   
         xfree(content);  
         rcsnum_free(branch);          rcsnum_free(branch);
         rcsnum_free(brev);          rcsnum_free(brev);
 }  }

Legend:
Removed from v.1.59  
changed lines
  Added in v.1.60