wok-next annotate cvs/stuff/patches/cvs-1.11.21-diff.patch @ rev 20586
Up cvs, apply patches
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Apr 14 14:19:43 2018 +0300 (2018-04-14) |
| parents | |
| children |
| rev | line source |
|---|---|
| al@20586 | 1 --- cvs-1.11.21/src/diff.c.old 2005-05-27 19:17:03.000000000 +0200 |
| al@20586 | 2 +++ cvs-1.11.21/src/diff.c 2005-12-15 15:22:05.000000000 +0100 |
| al@20586 | 3 @@ -955,14 +955,16 @@ |
| al@20586 | 4 /* The first revision does not exist. If EMPTY_FILES is |
| al@20586 | 5 true, treat this as an added file. Otherwise, warn |
| al@20586 | 6 about the missing tag. */ |
| al@20586 | 7 - if( use_rev2 == NULL || RCS_isdead( vers->srcfile, use_rev2 ) ) |
| al@20586 | 8 + if( use_rev2 == NULL || RCS_isdead( vers->srcfile, use_rev2 ) ) { |
| al@20586 | 9 /* At least in the case where DIFF_REV1 and DIFF_REV2 |
| al@20586 | 10 * are both numeric (and non-existant (NULL), as opposed to |
| al@20586 | 11 * dead?), we should be returning some kind of error (see |
| al@20586 | 12 * basicb-8a0 in testsuite). The symbolic case may be more |
| al@20586 | 13 * complicated. |
| al@20586 | 14 */ |
| al@20586 | 15 - return DIFF_SAME; |
| al@20586 | 16 + error (0, 0, "no revision in file %s or missing file %s", finfo->fullname, finfo->fullname); |
| al@20586 | 17 + return DIFF_ERROR; |
| al@20586 | 18 + } |
| al@20586 | 19 if( empty_files ) |
| al@20586 | 20 return DIFF_ADDED; |
| al@20586 | 21 if( use_rev1 != NULL ) |