diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-23 13:59:08 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-23 13:59:08 +0000 |
| commit | 45c84ad555d53829965c91a04b870bf8a28c6d38 (patch) | |
| tree | 5a9a648579d2577a6cb39a2ad65ddaa20478ca22 /usr.bin | |
| parent | 0ce88c1aae765d4536e0f911c6ff8285ba02e27f (diff) | |
cannot combine -kv and -l;
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/rcs/co.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index 394737761fc..5d24a45bc0f 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.34 2005/11/23 09:39:20 xsa Exp $ */ +/* $OpenBSD: co.c,v 1.35 2005/11/23 13:59:07 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -136,6 +136,11 @@ checkout_main(int argc, char **argv) printf("%s --> %s\n", fpath, (pipeout == 1) ? "standard output" : argv[i]); + if ((flags & CO_LOCK) && (kflag & RCS_KWEXP_VAL)) { + cvs_log(LP_ERR, "%s: cannot combine -kv and -l", fpath); + continue; + } + if ((file = rcs_open(fpath, RCS_RDWR)) == NULL) continue; |