From aa0eaafee054e58df363b77165e3cc394ea330f8 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 7 Jan 2008 07:47:21 +0000 Subject: [PATCH] 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. --- contrib/cvs/src/parseinfo.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/cvs/src/parseinfo.c b/contrib/cvs/src/parseinfo.c index 38a11c6d2c1..5e34add5ea1 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