From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: RCS keyword removal Date: 13 Apr 2004 18:10:18 +0900 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <20040410060006.GA24729@fencepost> <1081696710.770.115.camel@localhost> <20040411155130.GA30439@fencepost> <1081703812.770.131.camel@localhost> <1081761295.770.151.camel@localhost> Reply-To: Miles Bader NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1081847643 1355 80.91.224.253 (13 Apr 2004 09:14:03 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 13 Apr 2004 09:14:03 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue Apr 13 11:13:55 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BDJzP-0005GX-00 for ; Tue, 13 Apr 2004 11:13:55 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BDJzP-0005hC-00 for ; Tue, 13 Apr 2004 11:13:55 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDJxI-0001x4-Bc for emacs-devel@quimby.gnus.org; Tue, 13 Apr 2004 05:11:44 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1BDJwe-0001o2-IA for emacs-devel@gnu.org; Tue, 13 Apr 2004 05:11:04 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1BDJw6-00014E-1a for emacs-devel@gnu.org; Tue, 13 Apr 2004 05:11:01 -0400 Original-Received: from [210.143.35.52] (helo=TYO202.gate.nec.co.jp) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDJw5-00010a-1A; Tue, 13 Apr 2004 05:10:29 -0400 Original-Received: from mailgate3.nec.co.jp (mailgate53.nec.co.jp [10.7.69.162] (may be forged)) by TYO202.gate.nec.co.jp (8.11.7/3.7W01080315) with ESMTP id i3D9ANh16448; Tue, 13 Apr 2004 18:10:24 +0900 (JST) Original-Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id i3D9AMn27611; Tue, 13 Apr 2004 18:10:22 +0900 (JST) Original-Received: from edtmg05.lsi.nec.co.jp ([10.26.17.202]) by mailsv3.nec.co.jp (8.11.7/3.7W-MAILSV4-NEC) with ESMTP id i3D9ALT01113; Tue, 13 Apr 2004 18:10:21 +0900 (JST) Original-Received: from mcsss2.ucom.lsi.nec.co.jp (localhost [127.0.0.1]) by edtmg05.lsi.nec.co.jp (8.12.10/8.12.10) with ESMTP id i3D9AK2a015484; Tue, 13 Apr 2004 18:10:21 +0900 (JST) Original-Received: from mcspd15 (mcspd15 [10.30.114.174]) by mcsss2.ucom.lsi.nec.co.jp (8.12.10/8.12.8/EDcg v2.01-mc/1046780839) with ESMTP id i3D9AKnX019615; Tue, 13 Apr 2004 18:10:20 +0900 (JST) Original-Received: by mcspd15 (Postfix, from userid 31295) id 1ED60131E4; Tue, 13 Apr 2004 18:10:18 +0900 (JST) Original-To: Andre Spiegel System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <1081761295.770.151.camel@localhost> Original-Lines: 44 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:21555 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21555 Andre Spiegel writes: > I don't quite see the point here. Why don't you just check out your > work area anew, and all your keywords will be unexpanded? All of this > assumes that we are only talking about disabling the keywords locally > (i.e. using "cvs update -kb file", rather than "cvs admin -kb file"). Ok, I tried this ... and it didn't work. I did: CVSROOT=... cvs co -kb -d test-emacs emacs and files containing RCS keywords within `test-emacs' still had expanded keyword values -- though the expansions were different than the `normal' expanded values (they were slightly out of date, and seemed to contain info for the revision just prior to the last one). I'm still confused as to what exactly CVS is doing with this stuff, but one model that might be consistent with the behavior I observe is that CVS (1) expands keywords only on checkout/update, and (2) stores the expanded keywords in the repository when you commit (i.e., commit doesn't modify what's committed), (3) commit _does_ update the working copy of the file after the commit (i.e., there's always an implicit update after commit). If I'm correct about what's going on, then it seems: (1) If I use `cvs update -kb', the arch tree will still contain the expanded keywords, but the values will be slightly bogus. (2) The only way I can get consistent values between my different CVS branches is to actually check in the values I want into the other (CVS) branches (which might annoy CVS users, as the info then will be completely wrong -- e.g., the revision number in $Revision$ will be for a completely different branch). (3) Subsequent checkins by other CVS users (who aren't presumably using update -kb) will still change the keyword expansions I see. This won't be as bad as the current situation though, as at least my own commits won't cause changes in my working copy. I.e. what a mess... -Miles -- "1971 pickup truck; will trade for guns"