summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-09-27 16:33:36 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-09-27 16:33:36 +0000
commit940577141001e72cabb293c0bd071b42089f9623 (patch)
tree22645b782b82c9e947be2f63889896b709674647
parentaf458bf93bd13358db572577dfd3845e1c845f44 (diff)
add some file status checks in local setup;
-rw-r--r--usr.bin/cvs/tag.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index 9abe81eea42..77ec1e12c9f 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tag.c,v 1.32 2005/09/26 18:33:54 xsa Exp $ */
+/* $OpenBSD: tag.c,v 1.33 2005/09/27 16:33:35 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2004 Joris Vink <joris@openbsd.org>
@@ -262,6 +262,18 @@ cvs_tag_local(CVSFILE *cf, void *arg)
if (verbosity > 1)
cvs_log(LP_WARN, "nothing known about %s", fpath);
return (0);
+ } else if (cf->cf_cvstat == CVS_FST_ADDED) {
+ if (verbosity > 1)
+ cvs_log(LP_WARN,
+ "couldn't tag added but un-commited file `%s'",
+ fpath);
+ return (0);
+ } else if (cf->cf_cvstat == CVS_FST_REMOVED) {
+ if (verbosity > 1)
+ cvs_log(LP_WARN,
+ "skipping removed but un-commited file `%s'",
+ fpath);
+ return (0);
}
tag_rev = cf->cf_lrev;