diff options
| -rw-r--r-- | usr.bin/rcs/ci.1 | 10 | ||||
| -rw-r--r-- | usr.bin/rcs/ci.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/rcs/ci.1 b/usr.bin/rcs/ci.1 index 050f2d7aa71..80029cd1eb0 100644 --- a/usr.bin/rcs/ci.1 +++ b/usr.bin/rcs/ci.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ci.1,v 1.21 2005/12/12 09:38:22 xsa Exp $ +.\" $OpenBSD: ci.1,v 1.22 2006/02/16 13:32:27 niallo Exp $ .\" .\" Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org> .\" All rights reserved. @@ -28,7 +28,7 @@ .Op Fl f Ns Op Ar rev .Op Fl i Ns Op Ar rev .Op Fl j Ns Op Ar rev -.Op Fl k Ns Ar mode +.Op Fl k Ns Op Ar rev .Op Fl l Ns Op Ar rev .Op Fl M Ns Op Ar rev .Op Fl m Ns Ar msg @@ -69,8 +69,10 @@ Print error and refuse to do check-in if the RCS file already exists. .It Fl j Ns Op Ar rev Only do update check-in. Print error and refuse to do check-in if the RCS file does not already exist. -.It Fl k Ns Ar mode -Specify the keyword substitution mode. +.It Fl k Ns Op Ar rev +Search the working file for keywords and set the revision number, +creation date, state and author to the values found in these keywords +instead of computing them. .It Fl l Ns Op Ar rev The same as .Fl r , diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index cb761df4037..99a8f2e87e0 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.94 2006/02/16 13:22:02 niallo Exp $ */ +/* $OpenBSD: ci.c,v 1.95 2006/02/16 13:32:27 niallo Exp $ */ /* * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -29,7 +29,7 @@ #include "rcsprog.h" #include "diff.h" -#define CI_OPTSTRING "d::f::i::j::k:l::m:M::N:n:qr::s:Tt:u::Vw:x:" +#define CI_OPTSTRING "d::f::i::j::k::l::m:M::N:n:qr::s:Tt:u::Vw:x:" #define DATE_NOW -1 #define DATE_MTIME -2 @@ -68,7 +68,7 @@ checkin_usage(void) { fprintf(stderr, "usage: ci [-MNqTV] [-d[date]] [-f[rev]] [-i[rev]] [-j[rev]]\n" - " [-kmode] [-l[rev]] [-M[rev]] [-mmsg] [-Nsymbol]\n" + " [-k[rev]] [-l[rev]] [-M[rev]] [-mmsg] [-Nsymbol]\n" " [-nsymbol] [-r[rev]] [-sstate] [-tfile|str] [-u[rev]]\n" " [-wusername] [-xsuffixes] file ...\n"); } |