diff options
author | Joris Vink <joris@cvs.openbsd.org> | 2008-03-09 13:01:23 +0000 |
---|---|---|
committer | Joris Vink <joris@cvs.openbsd.org> | 2008-03-09 13:01:23 +0000 |
commit | 6ac972721300ad9fbad20166c432fa41c1649f8e (patch) | |
tree | 8b52a67f047a15a635bc21401326a56e9d65750b /usr.bin | |
parent | 8399a4744764331d9279d6dd01e94b4615a3be4b (diff) |
when in server mode, be sure the client picks up any new directories
if they are available if we run with -d, however do not send the
stuff when running a checkout so empty directories do not even appear
in our working copy, saves us the whole pruning trouble at the end with co.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/cvs/update.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index f8ba7d8d61a..07790449cbc 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.139 2008/03/09 01:02:38 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.140 2008/03/09 13:01:22 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -197,6 +197,9 @@ cvs_update_enterdir(struct cvs_file *cf) fatal("cvs_update_enterdir: `%s': %s", cf->file_path, strerror(errno)); + if (cvs_server_active == 1 && cvs_cmdop != CVS_OP_CHECKOUT) + cvs_server_clear_sticky(cf->file_path); + if (cvs_cmdop != CVS_OP_EXPORT) { (void)xasprintf(&entry, "D/%s////", cf->file_name); |