diff options
| author | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
| commit | 3dc96f7243ece1d1f7f87b03334f840415e0db63 (patch) | |
| tree | 15f00bd8ebd718713d8c0a8707ebebfced99c550 /contrib/cvs/src/remove.c | |
| parent | cf46dfb750863d760d19b9858b0a336b158275da (diff) | |
| download | FreeBSD-src-3dc96f7243ece1d1f7f87b03334f840415e0db63.zip FreeBSD-src-3dc96f7243ece1d1f7f87b03334f840415e0db63.tar.gz | |
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
Diffstat (limited to 'contrib/cvs/src/remove.c')
| -rw-r--r-- | contrib/cvs/src/remove.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cvs/src/remove.c b/contrib/cvs/src/remove.c index 691d141..c9224bd 100644 --- a/contrib/cvs/src/remove.c +++ b/contrib/cvs/src/remove.c @@ -90,7 +90,7 @@ cvsremove (argc, argv) start_recursion (remove_force_fileproc, (FILESDONEPROC) NULL, (DIRENTPROC) NULL, (DIRLEAVEPROC) NULL, (void *) NULL, argc, argv, local, W_LOCAL, - 0, 0, (char *) NULL, 0); + 0, LOCK_NONE, (char *) NULL, 0); } /* else FIXME should probably act as if the file doesn't exist in doing the following checks. */ @@ -100,6 +100,7 @@ cvsremove (argc, argv) ign_setup (); if (local) send_arg("-l"); + send_arg ("--"); /* FIXME: Can't we set SEND_NO_CONTENTS here? Needs investigation. */ send_files (argc, argv, local, 0, 0); send_file_names (argc, argv, 0); @@ -113,7 +114,7 @@ cvsremove (argc, argv) err = start_recursion (remove_fileproc, (FILESDONEPROC) NULL, remove_dirproc, (DIRLEAVEPROC) NULL, NULL, argc, argv, - local, W_LOCAL, 0, 1, (char *) NULL, 1); + local, W_LOCAL, 0, LOCK_READ, (char *) NULL, 1); if (removed_files && !really_quiet) error (0, 0, "use '%s commit' to remove %s permanently", program_name, |
