diff options
| author |   sturm <sturm@openbsd.org> | 2007-05-12 13:58:35 +0000 |
|---|---|---|
| committer | sturm <sturm@openbsd.org> | 2007-05-12 13:58:35 +0000 |
| commit | d794239817e02a772cf3bf227b5c7728f502b850 (patch) | |
| tree | f23e28e4979a950afb805d2083e17164ccf93ced /gnu/usr.bin/cvs/src/diff.c | |
| parent | pass refs around instead of extending them. (diff) | |
| download | wireguard-openbsd-d794239817e02a772cf3bf227b5c7728f502b850.tar.xz wireguard-openbsd-d794239817e02a772cf3bf227b5c7728f502b850.zip | |
when comparing two revisions of a directory tree, don't show dead files
as new in the 2nd revision
'makes sense' niallo, ok xsa
Diffstat (limited to 'gnu/usr.bin/cvs/src/diff.c')
| -rw-r--r-- | gnu/usr.bin/cvs/src/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/cvs/src/diff.c b/gnu/usr.bin/cvs/src/diff.c index 9732f5d1e91..961d93254ec 100644 --- a/gnu/usr.bin/cvs/src/diff.c +++ b/gnu/usr.bin/cvs/src/diff.c @@ -869,7 +869,7 @@ diff_file_nodiff (finfo, vers, empty_file) /* The first revision does not exist. If EMPTY_FILES is true, treat this as an added file. Otherwise, warn about the missing tag. */ - if (use_rev2 == NULL) + if (use_rev2 == NULL || RCS_isdead( vers->srcfile, use_rev2 ) ) /* At least in the case where DIFF_REV1 and DIFF_REV2 are both numeric, we should be returning some kind of error (see basicb-8a0 in testsuite). The symbolic |