diff options
| author |   joris <joris@openbsd.org> | 2009-03-28 16:47:33 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2009-03-28 16:47:33 +0000 |
| commit | 7c4661d98cc2b9f84d0052f95b295583ef8b8808 (patch) | |
| tree | 9981187a294424c6173dc503b50c5072ac2be484 | |
| parent | Use vnconfig's -t capability to avoid specifying geometry info to (diff) | |
| download | wireguard-openbsd-7c4661d98cc2b9f84d0052f95b295583ef8b8808.tar.xz wireguard-openbsd-7c4661d98cc2b9f84d0052f95b295583ef8b8808.zip | |
when i fixed to attic handling i forgot one special case
that we'd hit in normal checkouts/updates for duplicate file
and dirs.
found and diff tested by krw@
| -rw-r--r-- | usr.bin/cvs/file.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index f3ecd4cbbe0..bc350ee36b4 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.257 2009/03/26 22:54:37 joris Exp $ */ +/* $OpenBSD: file.c,v 1.258 2009/03/28 16:47:33 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -691,6 +691,13 @@ cvs_file_classify(struct cvs_file *cf, const char *tag) return; } + if (cf->file_flags & FILE_INSIDE_ATTIC && + cf->file_ent->ce_type == CVS_ENT_DIR && + cf->file_type != CVS_DIR) { + cf->file_status = FILE_SKIP; + return; + } + if (cf->file_flags & FILE_ON_DISK && cf->file_ent->ce_type == CVS_ENT_DIR && cf->file_type != CVS_DIR) |