diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-14 03:58:30 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-14 03:58:30 +0000 |
| commit | 7d54e7807fd98844ba963369bffbc1a25397f82b (patch) | |
| tree | c7b763d72a646f2ebd671ed1c984a3600e4117a1 /usr.bin/cvs/annotate.c | |
| parent | f8f91d32a4d2f21ccba26b483b9c1a1ccd61da0d (diff) | |
Added support for sticky date set in CVS/Tag and CVS/Entries per directory.
ok joris
Diffstat (limited to 'usr.bin/cvs/annotate.c')
| -rw-r--r-- | usr.bin/cvs/annotate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index 64ba622da69..2aaf612faf5 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.58 2008/06/09 16:34:22 tobias Exp $ */ +/* $OpenBSD: annotate.c,v 1.59 2008/06/14 03:58:29 tobias Exp $ */ /* * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -208,8 +208,9 @@ cvs_annotate_local(struct cvs_file *cf) } rcsnum_free(rev); } else { - rcs_rev_getlines(cf->file_rcs, (cvs_specified_date != -1) ? - cf->file_rcsrev : cf->file_rcs->rf_head, &alines); + rcs_rev_getlines(cf->file_rcs, (cvs_specified_date != -1 || + cvs_directory_date != -1) ? cf->file_rcsrev : + cf->file_rcs->rf_head, &alines); } /* Stick at weird GNU cvs, ignore error. */ |