From owner-p4-projects@FreeBSD.ORG  Mon Jan  7 07:37:44 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 671C916A41B; Mon,  7 Jan 2008 07:37:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2CEBB16A419
	for <perforce@freebsd.org>; Mon,  7 Jan 2008 07:37:44 +0000 (UTC)
	(envelope-from evilpete@gmail.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 260C313C457
	for <perforce@freebsd.org>; Mon,  7 Jan 2008 07:37:44 +0000 (UTC)
	(envelope-from evilpete@gmail.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077biKe030042
	for <perforce@freebsd.org>; Mon, 7 Jan 2008 07:37:44 GMT
	(envelope-from evilpete@gmail.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077bhEC030039
	for perforce@freebsd.org; Mon, 7 Jan 2008 07:37:43 GMT
	(envelope-from evilpete@gmail.com)
Date: Mon, 7 Jan 2008 07:37:43 GMT
Message-Id: <200801070737.m077bhEC030039@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	evilpete@gmail.com using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132684 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jan 2008 07:37:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=132684

Change 132684 by peter@peter_overcee on 2008/01/07 07:37:36

	HACK! HACK!  Teach cvs-1.11 about 1.12-style keyword config controls.

Affected files ...

.. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#6 edit

Differences ...

==== //depot/projects/hammer/contrib/cvs/src/parseinfo.c#6 (text+ko) ====

@@ -429,6 +429,16 @@
 	    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