diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-08 21:32:08 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-08 21:32:08 +0000 |
| commit | 35bdf3b1b59c7dc14e9697cdbef99bf39df54a65 (patch) | |
| tree | 90f48f24ae72aefc7c55e1e91584cfdf84f28a43 /usr.bin/cvs/file.c | |
| parent | d1bacaeb462a6c1fbd0ab1af648febbfc6634b0f (diff) | |
do not override the specified tag (-r on the command line) with a directory
tag (if present) since this breaks certain things;
Diffstat (limited to 'usr.bin/cvs/file.c')
| -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 50ec4dc3e76..54f25abcb27 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.215 2008/02/04 18:23:58 tobias Exp $ */ +/* $OpenBSD: file.c,v 1.216 2008/02/08 21:32:07 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -644,7 +644,7 @@ cvs_file_classify(struct cvs_file *cf, const char *tag) fatal("%s is supposed to be a file, but it is not", cf->file_path); - if (cf->file_ent->ce_tag != NULL) + if (cf->file_ent->ce_tag != NULL && cvs_specified_tag == NULL) tag = cf->file_ent->ce_tag; } |