version 1.28, 2006/04/21 07:06:25 |
version 1.29, 2006/04/21 14:18:26 |
|
|
case 'k': |
case 'k': |
kflag = rcs_kflag_get(rcs_optarg); |
kflag = rcs_kflag_get(rcs_optarg); |
if (RCS_KWEXP_INVAL(kflag)) { |
if (RCS_KWEXP_INVAL(kflag)) { |
cvs_log(LP_ERR, |
warnx("invalid RCS keyword expansion mode"); |
"invalid RCS keyword expansion mode"); |
|
(usage)(); |
(usage)(); |
exit(1); |
exit(1); |
} |
} |
|
|
argv += rcs_optind; |
argv += rcs_optind; |
|
|
if (argc < 0) { |
if (argc < 0) { |
cvs_log(LP_ERR, "no input file"); |
warnx("no input file"); |
(usage)(); |
(usage)(); |
exit(1); |
exit(1); |
} |
} |
|
|
if (rev_str1 == NULL) { |
if (rev_str1 == NULL) { |
cvs_log(LP_ERR, "no base revision number given"); |
warnx("no base revision number given"); |
(usage)(); |
(usage)(); |
exit(1); |
exit(1); |
} |
} |
|
|
|
|
if ((bp = cvs_diff3(file, argv[i], rev1, rev2, |
if ((bp = cvs_diff3(file, argv[i], rev1, rev2, |
!(flags & QUIET))) == NULL) { |
!(flags & QUIET))) == NULL) { |
cvs_log(LP_ERR, "failed to merge"); |
warnx("failed to merge"); |
rcs_close(file); |
rcs_close(file); |
continue; |
continue; |
} |
} |
|
|
} else { |
} else { |
/* XXX mode */ |
/* XXX mode */ |
if (cvs_buf_write(bp, argv[i], 0644) < 0) |
if (cvs_buf_write(bp, argv[i], 0644) < 0) |
cvs_log(LP_ERR, "failed to write new file"); |
warnx("cvs_buf_write failed"); |
|
|
cvs_buf_free(bp); |
cvs_buf_free(bp); |
} |
} |