From owner-freebsd-bugs@FreeBSD.ORG Mon Apr 14 06:50:13 2003 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 94ABB37B409 for ; Mon, 14 Apr 2003 06:50:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 030BE43F3F for ; Mon, 14 Apr 2003 06:50:11 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3EDoAUp067934 for ; Mon, 14 Apr 2003 06:50:10 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3EDoACO067933; Mon, 14 Apr 2003 06:50:10 -0700 (PDT) Resent-Date: Mon, 14 Apr 2003 06:50:10 -0700 (PDT) Resent-Message-Id: <200304141350.h3EDoACO067933@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, Munehiro Matsuda Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FD2D37B401 for ; Mon, 14 Apr 2003 06:49:22 -0700 (PDT) Received: from hfep06.dion.ne.jp (hfep06.dion.ne.jp [203.181.105.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A55343FBD for ; Mon, 14 Apr 2003 06:49:21 -0700 (PDT) (envelope-from haro@h4.dion.ne.jp) Received: from localhost ([61.200.137.102]) by hfep06.dion.ne.jp with ESMTP id <20030414134918702.PGQM@hfep06.dion.ne.jp> for ; Mon, 14 Apr 2003 22:49:18 +0900 Message-Id: <20030414.224916.74756518.haro@h4.dion.ne.jp> Date: Mon, 14 Apr 2003 22:49:16 +0900 (JST) From: Munehiro Matsuda To: FreeBSD-gnats-submit@FreeBSD.org Subject: gnu/50942: cvs does not update CVSROOT/options automatically X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Munehiro Matsuda List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2003 13:50:14 -0000 >Number: 50942 >Category: gnu >Synopsis: cvs does not update CVSROOT/options automatically >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Apr 14 06:50:10 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Munehiro Matsuda >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD jkpc11.ttr.kubota.co.jp 5.0-CURRENT FreeBSD 5.0-CURRENT #158: Sun Apr 13 19:08:27 JST 2003 haro@jkpc11.ttr.kubota.co.jp:/home/haro/tmp/sys/i386/compile/NEWJKPC11 i386 $ cvs --version Concurrent Versions System (CVS) 1.11.5-FreeBSD (client/server) >Description: FreeBSD has localy added CVSROOT/options handling capability to cvs-1.11.5 for the base system. When updating files in CVSROOT diectory, most of the files gets update automatically, when changes are commited. But for reasons unknown, CVSROOT/options file does not get updated automatically, unlinke all other files. >How-To-Repeat: haro[1] pwd /home/haro/tmp haro[2] ls haro[3] cvs -d /home/haro/tmp/cvs init haro[4] ls cvs/CVSROOT Emptydir/ config editinfo,v modules,v taginfo checkoutlist config,v history notify taginfo,v checkoutlist,v cvswrappers loginfo notify,v val-tags commitinfo cvswrappers,v loginfo,v rcsinfo verifymsg commitinfo,v editinfo modules rcsinfo,v verifymsg,v haro[5] haro[5] cvs -d /home/haro/tmp/cvs co CVSROOT cvs checkout: Updating CVSROOT U CVSROOT/checkoutlist U CVSROOT/commitinfo U CVSROOT/config U CVSROOT/cvswrappers U CVSROOT/editinfo U CVSROOT/loginfo U CVSROOT/modules U CVSROOT/notify U CVSROOT/rcsinfo U CVSROOT/taginfo U CVSROOT/verifymsg haro[6] haro[6] cd CVSROOT haro[7] echo tag=Test=CVSHeader > options haro[8] echo tagexpand=iTest >> options haro[9] haro[9] cvs add options cvs add: scheduling file `options' for addition cvs add: use 'cvs commit' to add this file permanently haro[10] haro[10] cvs ci -m"Test options" options RCS file: /home/haro/tmp/cvs/CVSROOT/options,v done Checking in options; /home/haro/tmp/cvs/CVSROOT/options,v <-- options initial revision: 1.1 done cvs commit: Rebuilding administrative file database haro[11] haro[11] ls -l /home/haro/tmp/cvs/CVSROOT/options* -r--r--r-- 1 haro user 207 Apr 14 21:35 /home/haro/tmp/cvs/CVSROOT/options,v ^^^^^^^^^ As you can see, CVSROOT/options file is missing. >Fix: --- src/contrib/cvs/src/mkmodules.c.ctm Tue Sep 3 21:08:05 2002 +++ src/contrib/cvs/src/mkmodules.c Mon Apr 14 19:08:38 2003 @@ -375,6 +375,13 @@ {CVSROOTADM_CONFIG, "a %s file configures various behaviors", config_contents}, + + + /* FreeBSD's local options file handling */ + {CVSROOTADM_OPTIONS, + "a %s file configures optional header handling", + NULL}, + {NULL, NULL, NULL} }; >Release-Note: >Audit-Trail: >Unformatted: