diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2007-02-09 08:00:38 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2007-02-09 08:00:38 +0000 |
| commit | 639edfff30f409f091d0eb7178cf9f55106086e7 (patch) | |
| tree | c6fd1ad52cce20d49a8abfa4795ae67c5e5c15df | |
| parent | 01f2ef952df4127f7b153e22c88c005b62bc743d (diff) | |
if a directory exists in the working dir but not in the
repository, mark it as to be skipped so we do not try to
lock it on update and miserably fail... OK joris@.
| -rw-r--r-- | usr.bin/cvs/update.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index f2d47082bc7..971fb033898 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.93 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: update.c,v 1.94 2007/02/09 08:00:37 xsa Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -161,7 +161,8 @@ cvs_update_enterdir(struct cvs_file *cf) cvs_ent_add(entlist, entry); cvs_ent_close(entlist, ENT_SYNC); xfree(entry); - } else if (cf->file_status == DIR_CREATE && build_dirs == 0) { + } else if ((cf->file_status == DIR_CREATE && build_dirs == 0) || + cf->file_status == FILE_UNKNOWN) { cf->file_status = FILE_SKIP; } } |