From asmodai@purgatory.homeunix.net  Sun Aug 29 11:20:15 2004
Return-Path: <asmodai@purgatory.homeunix.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0AEB916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Aug 2004 13:13:48 +0200 (CEST)
Received: from purgatory.homeunix.net ([127.0.0.1])
 by localhost (nexus.chronias.ninth-circle.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 98989-10 for <FreeBSD-gnats-submit@freebsd.org>;
 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 <asmodai@dragonflybsd.org>
Reply-To: Jeroen Ruigrok van der Werven <asmodai@dragonflybsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: CVS keywords are not expanded with CVS 1.12.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71098
>Category:       bin
>Synopsis:       [cvsadm] [patch] CVS keywords are not expanded with CVS 1.12.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cvsadm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 29 11:20:26 GMT 2004
>Closed-Date:    Fri Feb 29 00:53:06 UTC 2008
>Last-Modified:  Fri Feb 29 00:53:06 UTC 2008
>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:
Responsible-Changed-From-To: freebsd-bugs->cvsadm 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Sat Jun 23 16:09:57 UTC 2007 
Responsible-Changed-Why:  

Over to cvsadm, it's a request for a change of the FreeBSD cvs 
repository config. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71098 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/71098: commit references a PR
Date: Mon,  7 Jan 2008 00:01:25 +0000 (UTC)

 peter       2008-01-07 00:01:19 UTC
 
   FreeBSD src repository
 
   Modified files:
     .                    config 
   Log:
   Add cvs-1.12-friendly $FreeBSD$ expansion controls.  This is believed
   to not interfere with our cvs-1.11, but it (and cvsup) will ignore it.
   
   PR:             71098
   Submitted by:   Jeroen Ruigrok van der Werven <asmodai@dragonflybsd.org>
   
   Revision  Changes    Path
   1.4       +5 -1      CVSROOT/config
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/71098: commit references a PR
Date: Mon,  7 Jan 2008 03:39:49 +0000 (UTC)

 peter       2008-01-07 03:39:44 UTC
 
   FreeBSD src repository
 
   Modified files:
     .                    approvecheck 
   Log:
   So, it turns out that the information in the PR referenced in the
   previous commit was in error.  cvs-1.11 does NOT like the cvs-1.12
   keywords config hooks and has a fatal error.
   
   PR:             71098
   Submitted by:   Jeroen Ruigrok van der Werven <asmodai@dragonflybsd.org>
   Pointy hat to:  peter (for believing the submitter)
   
   Revision  Changes    Path
   1.3       +9 -7      CVSROOT/approvecheck
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/71098: commit references a PR
Date: Mon,  7 Jan 2008 03:43:29 +0000 (UTC)

 peter       2008-01-07 03:43:22 UTC
 
   FreeBSD src repository
 
   Modified files:
     .                    config 
   Log:
   So, it turns out that the information in the PR referenced in the
   previous commit was not entirely correct.  cvs-1.11 does object to
   the cvs-1.12 style keywords config hooks.  It doesn't explode, but it
   yells loudly.  Comment out.
   
   PR:             71098
   
   Revision  Changes    Path
   1.5       +2 -2      CVSROOT/config
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Feb 29 00:47:13 UTC 2008 
State-Changed-Why:  
Committed 2008-01-07 by peter. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71098 
>Unformatted:
