From c026ca6affb58d2b01cb76cebf76a1f3af021ce3 Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Fri, 9 Nov 2007 16:21:25 +0000 Subject: Fix for a rather unintuitive behaviour, this way it can be reproduced: cvs checkout src/sbin/swapon cvs checkout -rHEAD src/sbin/swapon If no date or revision has been supplied, swapon.8 won't be checked out, but if a revision (even if it is HEAD) or a date (-D) has been supplied, swapon.8 will be checked out due to modifications in Attic/ after it has been removed from tree. --- usr.bin/cvs/file.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'usr.bin') diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 72ff91c3323..9e6f27660b1 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.204 2007/10/09 12:20:24 tobias Exp $ */ +/* $OpenBSD: file.c,v 1.205 2007/11/09 16:21:24 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2004 Jean-Francois Brousseau @@ -732,6 +732,10 @@ cvs_file_classify(struct cvs_file *cf, const char *tag) if (!strcmp(state, RCS_STATE_DEAD)) rcsdead = 1; + if (cvs_specified_tag == NULL && cf->in_attic && + !RCSNUM_ISBRANCHREV(cf->file_rcsrev)) + rcsdead = 1; + cf->file_rcs->rf_dead = rcsdead; } -- cgit v1.2.3