From e724a34b7d3b6b4ec029dcd0ea4940bcaa86efe6 Mon Sep 17 00:00:00 2001 From: Joris Vink Date: Thu, 28 Jun 2007 04:54:12 +0000 Subject: do not call cvs_checkout_file() for file removals in local mode, only required in server mode due to the fact we need to let the client now its been removed, found this the hard way. --- usr.bin/cvs/update.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index b3d6652b91a..11bee406c05 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.101 2007/06/27 03:58:16 joris Exp $ */ +/* $OpenBSD: update.c,v 1.102 2007/06/28 04:54:11 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * @@ -357,7 +357,8 @@ cvs_update_local(struct cvs_file *cf) break; case FILE_UNLINK: (void)unlink(cf->file_path); - cvs_checkout_file(cf, cf->file_rcsrev, CO_REMOVE); + if (cvs_server_active == 1) + cvs_checkout_file(cf, cf->file_rcsrev, CO_REMOVE); case FILE_REMOVE_ENTRY: entlist = cvs_ent_open(cf->file_wd); cvs_ent_remove(entlist, cf->file_name); -- cgit v1.2.3