diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1997-05-21 16:21:08 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1997-05-21 16:21:08 +0000 |
| commit | 348d4584473ee3eeef7274ecf1d40d8b2e838cb4 (patch) | |
| tree | a3e274151a4029d766e74298b76dfbad1a3d0d18 /contrib/cvs | |
| parent | 48d26cf4106e28c6a7a4120f72668b37f98fe812 (diff) | |
| download | src-348d4584473ee3eeef7274ecf1d40d8b2e838cb4.tar.gz src-348d4584473ee3eeef7274ecf1d40d8b2e838cb4.zip | |
Attempt to work around the problem Bruce reported with 'cvs diff -rHEAD'
complaining about long-deleted files having been deleted and that there
is no diff available.
Notes
Notes:
svn path=/head/; revision=25970
Diffstat (limited to 'contrib/cvs')
| -rw-r--r-- | contrib/cvs/src/diff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c index 8253a2ff691f..cc29f09522ba 100644 --- a/contrib/cvs/src/diff.c +++ b/contrib/cvs/src/diff.c @@ -383,14 +383,16 @@ diff_fileproc (callerdat, finfo) exists = 0; /* special handling for TAG_HEAD */ if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0) - exists = vers->vn_rcs != NULL; + exists = (vers->vn_rcs != NULL && /* XXX ? */ + !RCS_isdead (vers->srcfile, vers->vn_rcs)); /*XXX*/ else { Vers_TS *xvers; xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1, 1, 0); - exists = xvers->vn_rcs != NULL; + exists = (vers->vn_rcs != NULL && + !RCS_isdead (vers->srcfile, vers->vn_rcs)); /*XXX*/ freevers_ts (&xvers); } if (exists) |