src/usr.bin/cvs/import.c - diff

Return to import.c CVS log

Up to [local] / src / usr.bin / cvs

version 1.82, 2008/02/04 15:07:33

version 1.83, 2008/02/11 20:33:11

Line 230

if ((branch = rcsnum_parse(import_branch)) == NULL)

fatal("import_new: failed to parse branch");

if ((bp = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)

bp = cvs_buf_load_fd(cf->fd);

fatal("import_new: failed to load %s", cf->file_path);

if ((brev = rcsnum_brtorev(branch)) == NULL)

fatal("import_new: failed to get first branch revision");

Line 301

Line 300

if ((b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE)) == NULL)

fatal("import_update: failed to grab revision");

if ((b2 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)

b2 = cvs_buf_load_fd(cf->fd);

fatal("import_update: failed to load %s", cf->file_path);

ret = cvs_buf_differ(b1, b2);

cvs_buf_free(b1);

Line 363

Line 361

char *p1, *p2;

BUF *b1, *b2;

b2 = cvs_buf_alloc(128, BUF_AUTOEXT);

b2 = cvs_buf_alloc(128);

if (cvs_noexec != 1) {

if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)

b1 = cvs_buf_load_fd(cf->fd);

fatal("import_get_rcsdiff: failed loading %s",

cf->file_path);

(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);

cvs_buf_write_stmp(b1, p1, NULL);