diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-08 22:07:51 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-08 22:07:51 +0000 |
| commit | b425483dcf67a41ad5d6c58871e3e43a9b582db9 (patch) | |
| tree | 1e2dabcf5c535b7ecd1933c9c2827600ae3164cd /usr.bin | |
| parent | b34db8d928e95e730cdd03e44a6905a713b255ed (diff) | |
when checking if a file is really dead do not use cvs_specified_tag only,
instead use the local variable 'tag' which is filled in by our code
to match the correct tag (specified on the command line, or in Entries);
this way, files do not dissapear when they're suppose to be there
if you are using -rSOMETHING
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 54f25abcb27..dd215b1e958 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.216 2008/02/08 21:32:07 joris Exp $ */ +/* $OpenBSD: file.c,v 1.217 2008/02/08 22:07:50 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -771,7 +771,7 @@ 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 && + if (tag == NULL &&cf->in_attic && !RCSNUM_ISBRANCHREV(cf->file_rcsrev)) rcsdead = 1; |