archrelease: copy trunk to extra-x86_64
[arch-packages.git] / cvs / trunk / cvs-1.11.21-diff.patch
blobf2a306b94bdab755894148b3bd26ab6553327e15
1 --- cvs-1.11.21/src/diff.c.old 2005-05-27 19:17:03.000000000 +0200
2 +++ cvs-1.11.21/src/diff.c 2005-12-15 15:22:05.000000000 +0100
3 @@ -955,14 +955,16 @@
4 /* The first revision does not exist. If EMPTY_FILES is
5 true, treat this as an added file. Otherwise, warn
6 about the missing tag. */
7 - if( use_rev2 == NULL || RCS_isdead( vers->srcfile, use_rev2 ) )
8 + if( use_rev2 == NULL || RCS_isdead( vers->srcfile, use_rev2 ) ) {
9 /* At least in the case where DIFF_REV1 and DIFF_REV2
10 * are both numeric (and non-existant (NULL), as opposed to
11 * dead?), we should be returning some kind of error (see
12 * basicb-8a0 in testsuite). The symbolic case may be more
13 * complicated.
15 - return DIFF_SAME;
16 + error (0, 0, "no revision in file %s or missing file %s", finfo->fullname, finfo->fullname);
17 + return DIFF_ERROR;
18 + }
19 if( empty_files )
20 return DIFF_ADDED;
21 if( use_rev1 != NULL )