From 639edfff30f409f091d0eb7178cf9f55106086e7 Mon Sep 17 00:00:00 2001 From: Xavier Santolaria Date: Fri, 9 Feb 2007 08:00:38 +0000 Subject: 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@. --- usr.bin/cvs/update.c | 5 +++-- 1 file 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 * @@ -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; } } -- cgit v1.2.3