From owner-freebsd-bugs@FreeBSD.ORG Sun Aug 29 11:20:27 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F7E216A4CF for ; Sun, 29 Aug 2004 11:20:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2286343D45 for ; Sun, 29 Aug 2004 11:20:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i7TBKR2A060287 for ; Sun, 29 Aug 2004 11:20:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7TBKRi8060286; Sun, 29 Aug 2004 11:20:27 GMT (envelope-from gnats) Resent-Date: Sun, 29 Aug 2004 11:20:27 GMT Resent-Message-Id: <200408291120.i7TBKRi8060286@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeroen Ruigrok van der Werven Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0AEB916A4CE for ; Sun, 29 Aug 2004 11:20:15 +0000 (GMT) Received: from post-23.mail.nl.demon.net (post-23.mail.nl.demon.net [194.159.73.193]) by mx1.FreeBSD.org (Postfix) with ESMTP id C81B943D1F for ; Sun, 29 Aug 2004 11:20:14 +0000 (GMT) (envelope-from asmodai@purgatory.homeunix.net) Received: from sakko.demon.nl ([82.161.50.213]:1957 helo=purgatory.homeunix.net) by post-23.mail.nl.demon.net with esmtp (Exim 4.34) id 1C1NfN-0000yv-Tc for FreeBSD-gnats-submit@freebsd.org; Sun, 29 Aug 2004 11:20:04 +0000 Received: from localhost (localhost.chronias.ninth-circle.org [127.0.0.1]) by purgatory.homeunix.net (Postfix) with ESMTP id DAFF2FDB for ; Sun, 29 Aug 2004 13:13:48 +0200 (CEST) Received: from purgatory.homeunix.net ([127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 98989-10 for ; Sun, 29 Aug 2004 13:13:45 +0200 (CEST) Received: by purgatory.homeunix.net (Postfix, from userid 1000) id C3A1FF17; Sun, 29 Aug 2004 13:13:45 +0200 (CEST) Message-Id: <20040829111345.C3A1FF17@purgatory.homeunix.net> Date: Sun, 29 Aug 2004 13:13:45 +0200 (CEST) From: Jeroen Ruigrok van der Werven To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: misc/71098: CVS keywords are not expanded with CVS 1.12.x X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jeroen Ruigrok van der Werven List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Aug 2004 11:20:27 -0000 >Number: 71098 >Category: misc >Synopsis: CVS keywords are not expanded with CVS 1.12.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 29 11:20:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Jeroen Ruigrok van der Werven >Release: N/A >Organization: DragonFly >Environment: N/A >Description: With CVS 1.12.x the keyword expansion is natively being taken care of in 'config' and not in 'options' (which is a local hack in cvs' main.c, r1.5). >How-To-Repeat: Take a stock cvs 1.12.x and checkout from a FreeBSD repository. The keywords will not get expanded. >Fix: Apply following patch, it does not interfere with 1.11.x and allows 1.12.x to work as it should. Index: CVSROOT/config =================================================================== RCS file: /home/ncvs/FreeBSD/CVSROOT/config,v retrieving revision 1.1 diff -u -r1.1 config --- CVSROOT/config 27 Feb 2003 19:35:24 -0000 1.1 +++ CVSROOT/config 29 Aug 2004 11:03:40 -0000 @@ -19,3 +19,8 @@ # repositories. Set it to `never' (the previous CVS behavior) to prevent # verifymsg scripts from changing the log message. #RereadLogAfterVerify=always + +# Add the "FreeBSD" keyword and restrict keyword expansion +LocalKeyword=FreeBSD=CVSHeader +KeywordExpand=iFreeBSD + >Release-Note: >Audit-Trail: >Unformatted: