[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.49 and 1.50

version 1.49, 2006/06/11 17:50:11 version 1.50, 2006/06/14 14:10:50
Line 179 
Line 179 
         if ((branch = rcsnum_parse(import_branch)) == NULL)          if ((branch = rcsnum_parse(import_branch)) == NULL)
                 fatal("import_new: failed to parse branch");                  fatal("import_new: failed to parse branch");
   
         if ((bp = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)          if ((bp = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
                 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');
Line 249 
Line 249 
                 if ((b1 = rcs_getrev(cf->file_rcs, rev)) == NULL)                  if ((b1 = rcs_getrev(cf->file_rcs, rev)) == NULL)
                         fatal("import_update: failed to grab revision");                          fatal("import_update: failed to grab revision");
   
                 /* XXX */                  if ((b2 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
                 if ((b2 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)  
                         fatal("import_update: failed to load %s",                          fatal("import_update: failed to load %s",
                             cf->file_path);                              cf->file_path);
   
Line 321 
Line 320 
         char *delta, *p1, *p2;          char *delta, *p1, *p2;
         BUF *b1, *b2, *b3;          BUF *b1, *b2, *b3;
   
         /* XXX */          if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
         if ((b1 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)  
                 fatal("import_get_rcsdiff: failed loading %s", cf->file_path);                  fatal("import_get_rcsdiff: failed loading %s", cf->file_path);
   
         if ((b2 = rcs_getrev(cf->file_rcs, rev)) == NULL)          if ((b2 = rcs_getrev(cf->file_rcs, rev)) == NULL)
Legend:
Removed from v.1.49  
changed lines
  Added in v.1.50