From 3dc96f7243ece1d1f7f87b03334f840415e0db63 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 2 Dec 2002 03:13:37 +0000 Subject: Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all of the bugs that I know of. We've been running a slightly older version of this on freefall/repoman, where it was afflicted by a silly merge error on my part (fixed). Approved by: re --- contrib/cvs/src/annotate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib/cvs/src/annotate.c') diff --git a/contrib/cvs/src/annotate.c b/contrib/cvs/src/annotate.c index 41acdf7..8c72962 100644 --- a/contrib/cvs/src/annotate.c +++ b/contrib/cvs/src/annotate.c @@ -110,6 +110,7 @@ annotate (argc, argv) option_with_arg ("-r", tag); if (date) client_senddate (date); + send_arg ("--"); if (is_rannotate) { int i; @@ -247,7 +248,7 @@ rannotate_proc (argc, argv, xwhere, mwhere, mfile, shorten, local, mname, msg) err = start_recursion (annotate_fileproc, (FILESDONEPROC) NULL, (DIRENTPROC) NULL, (DIRLEAVEPROC) NULL, NULL, - argc - 1, argv + 1, local, which, 0, 1, + argc - 1, argv + 1, local, which, 0, LOCK_READ, where, 1); return err; } -- cgit v1.1