diff options
author | peter <peter@FreeBSD.org> | 2008-01-07 07:47:21 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2008-01-07 07:47:21 +0000 |
commit | 2bb84b573ee38cabb912d8036c8562f87017f8c9 (patch) | |
tree | 61e9f8cfac9888589c67eee5f5c82c3858be1a73 /contrib/cvs/src | |
parent | 70ef09a6953e9fac946a898ec2e562c87f16678c (diff) | |
download | FreeBSD-src-2bb84b573ee38cabb912d8036c8562f87017f8c9.zip FreeBSD-src-2bb84b573ee38cabb912d8036c8562f87017f8c9.tar.gz |
Add a forward compatability hook so that current cvs can recognize future
CVSROOT/config file options that control keyword expansion. cvs-1.12 has
its own $Id$ expansion controls and they're configured in CVSROOT/config
rather than CVSROOT/options. The problem is that current cvs-1.11.x
doesn't understand the future keywords.....
Add trivial forward support for the new keywords for when cvs-1.12
hits the tree down the road. CVSROOT/options won't be going away - cvsup
uses it.
Diffstat (limited to 'contrib/cvs/src')
-rw-r--r-- | contrib/cvs/src/parseinfo.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/contrib/cvs/src/parseinfo.c b/contrib/cvs/src/parseinfo.c index 38a11c6d..5e34add 100644 --- a/contrib/cvs/src/parseinfo.c +++ b/contrib/cvs/src/parseinfo.c @@ -429,6 +429,16 @@ warning: this CVS does not support PreservePermissions"); else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a |