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

Return to diff3.c CVS log

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

version 1.17, 2006/03/06 13:22:59

version 1.18, 2006/03/14 15:59:06

Line 155

int diff3_conflicts = 0;

BUF *

cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2)

cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)

{

int ret, argc;

char *data, *patch;

Line 173

if ((b1 = cvs_buf_load(workfile, BUF_AUTOEXT)) == NULL)

goto out;

cvs_printf("Retrieving revision %s\n", r1);

if (verbose == 1)

cvs_printf("Retrieving revision %s\n", r1);

if ((b2 = rcs_getrev(rf, rev1)) == NULL)

goto out;

cvs_printf("Retrieving revision %s\n", r2);

if (verbose == 1)

cvs_printf("Retrieving revision %s\n", r2);

if ((b3 = rcs_getrev(rf, rev2)) == NULL)

goto out;

Line 237

Line 239

if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)

goto out;

if (diff3_conflicts != 0) {

if ((verbose ==1) && (diff3_conflicts != 0)) {

cvs_log(LP_WARN, "%d conflict%s found during merge, "

"please correct.", diff3_conflicts,

(diff3_conflicts > 1) ? "s" : "");