version 1.27, 2006/04/19 06:53:41 |
version 1.28, 2006/04/21 07:06:25 |
|
|
break; |
break; |
case 'p': |
case 'p': |
rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); |
rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); |
pipeout = 1; |
flags |= PIPEOUT; |
break; |
break; |
case 'q': |
case 'q': |
rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); |
rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); |
|
|
|
|
fprintf(stderr, "Merging differences between %s and " |
fprintf(stderr, "Merging differences between %s and " |
"%s into %s%s\n", r1, r2, argv[i], |
"%s into %s%s\n", r1, r2, argv[i], |
(pipeout == 1) ? "; result to stdout":""); |
(flags & PIPEOUT) ? "; result to stdout":""); |
} |
} |
|
|
if ((bp = cvs_diff3(file, argv[i], rev1, rev2, |
if ((bp = cvs_diff3(file, argv[i], rev1, rev2, |
|
|
continue; |
continue; |
} |
} |
|
|
if (pipeout == 1) { |
if (flags & PIPEOUT) { |
cvs_buf_putc(bp, '\0'); |
cvs_buf_putc(bp, '\0'); |
fcont = cvs_buf_release(bp); |
fcont = cvs_buf_release(bp); |
printf("%s", fcont); |
printf("%s", fcont); |