summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/resp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/cvs/resp.c b/usr.bin/cvs/resp.c
index 192f73b80b2..22731f8e30f 100644
--- a/usr.bin/cvs/resp.c
+++ b/usr.bin/cvs/resp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: resp.c,v 1.29 2005/04/19 16:57:07 joris Exp $ */
+/* $OpenBSD: resp.c,v 1.30 2005/04/20 15:50:54 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -611,9 +611,11 @@ cvs_resp_updated(struct cvsroot *root, int type, char *line)
if ((type == CVS_RESP_UPDEXIST) || (type == CVS_RESP_UPDATED) ||
(type == CVS_RESP_MERGED) || (type == CVS_RESP_CREATED)) {
- if (cvs_ent_remove(entfile, ep->ce_name) < 0)
- cvs_log(LP_WARN, "failed to remove entry for `%s'",
+ if ((cvs_ent_remove(entfile, ep->ce_name) < 0) &&
+ (type != CVS_RESP_CREATED)) {
+ cvs_log(LP_WARN, "failed to remove entry for '%s`",
ep->ce_name);
+ }
}
if (cvs_ent_add(entfile, ep) < 0) {