diff options
| author |   jfb <jfb@openbsd.org> | 2004-12-13 22:53:48 +0000 |
|---|---|---|
| committer | jfb <jfb@openbsd.org> | 2004-12-13 22:53:48 +0000 |
| commit | 764cbfe32ad1259596ca50310972ee0c640b8e51 (patch) | |
| tree | 24c46b7f67a3eac63260dbcc7877c181f06981d4 /usr.bin/cvs/resp.c | |
| parent | pull all the conflict checking code into one single function, makes (diff) | |
| download | wireguard-openbsd-764cbfe32ad1259596ca50310972ee0c640b8e51.tar.xz wireguard-openbsd-764cbfe32ad1259596ca50310972ee0c640b8e51.zip | |
yet another mistake in the protocol docs...even if we send the
appropriate Entry for a file which was lost locally, the server
responds with a Created, so we must remove the previous entry
before replacing it with the one we receive.
Diffstat (limited to 'usr.bin/cvs/resp.c')
| -rw-r--r-- | usr.bin/cvs/resp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/resp.c b/usr.bin/cvs/resp.c index 6767c8fe5e1..028ad22b3a8 100644 --- a/usr.bin/cvs/resp.c +++ b/usr.bin/cvs/resp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resp.c,v 1.17 2004/12/13 17:09:01 jfb Exp $ */ +/* $OpenBSD: resp.c,v 1.18 2004/12/13 22:53:48 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -584,7 +584,7 @@ cvs_resp_updated(struct cvsroot *root, int type, char *line) ep->ce_mtime = time(&(ep->ce_mtime)); if ((type == CVS_RESP_UPDEXIST) || (type == CVS_RESP_UPDATED) || - (type == CVS_RESP_MERGED)) { + (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'", ep->ce_name); |