diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-03-24 17:03:33 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-03-24 17:03:33 +0000 |
| commit | df8a993398cbce57acf3b2135e89a2fae3966655 (patch) | |
| tree | 78a58cc2a852981e2c8e94e07ef135c2d255473a /usr.bin/cvs/update.c | |
| parent | 6bbb5956d74e3e5680db22a51934dd33f45eb81c (diff) | |
shuffle code a bit so FILE_REMOVE_ENTRY also calls
cvs_checkout_file() with CO_REMOVE set otherwise our server
would never inform the client the entry should be removed.
Diffstat (limited to 'usr.bin/cvs/update.c')
| -rw-r--r-- | usr.bin/cvs/update.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 24cd9a7fabb..c3563abea2e 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.159 2009/03/23 07:40:30 joris Exp $ */ +/* $OpenBSD: update.c,v 1.160 2009/03/24 17:03:32 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -450,12 +450,13 @@ cvs_update_local(struct cvs_file *cf) break; case FILE_UNLINK: (void)unlink(cf->file_path); - if (cvs_server_active == 1) - cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_REMOVE); case FILE_REMOVE_ENTRY: entlist = cvs_ent_open(cf->file_wd); cvs_ent_remove(entlist, cf->file_name); cvs_history_add(CVS_HISTORY_UPDATE_REMOVE, cf, NULL); + + if (cvs_server_active == 1) + cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_REMOVE); break; case FILE_UPTODATE: if (cvs_cmdop != CVS_OP_UPDATE) |