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: Sun, 11 Apr 2004 11:51:30 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20040411155130.GA30439@fencepost> References: <20040410060006.GA24729@fencepost> <1081696710.770.115.camel@localhost> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1081698791 1019 80.91.224.253 (11 Apr 2004 15:53:11 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 11 Apr 2004 15:53:11 +0000 (UTC) Cc: emacs-devel@gnu.org, Miles Bader Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sun Apr 11 17:53:04 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 1BChGa-00056I-00 for ; Sun, 11 Apr 2004 17:53:04 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BChGZ-0008Pg-00 for ; Sun, 11 Apr 2004 17:53:04 +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 1BChFs-0001bL-Uw for emacs-devel@quimby.gnus.org; Sun, 11 Apr 2004 11:52:20 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1BChFd-0001Sb-Tp for emacs-devel@gnu.org; Sun, 11 Apr 2004 11:52:05 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1BChF5-0000ci-C2 for emacs-devel@gnu.org; Sun, 11 Apr 2004 11:52:02 -0400 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BChF5-0000cZ-4h for emacs-devel@gnu.org; Sun, 11 Apr 2004 11:51:31 -0400 Original-Received: from miles by fencepost.gnu.org with local (Exim 4.24) id 1BChF4-0000N8-TH; Sun, 11 Apr 2004 11:51:30 -0400 Original-To: Andre Spiegel Content-Disposition: inline In-Reply-To: <1081696710.770.115.camel@localhost> User-Agent: Mutt/1.3.28i Blat: Foop 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:21480 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21480 On Sun, Apr 11, 2004 at 05:18:30PM +0200, Andre Spiegel wrote: > On Sat, 2004-04-10 at 08:00, Miles Bader wrote: > > > The ones I _didn't_ remove were in vc-*.el > > Could you tell me what specific operations they cause you trouble with? > (Others who are having trouble with version headers, please also > respond.) With merging between different branches outside of CVS. A merge is done, and then the merged branches reconciled with CVS -- which changes the keywords, and causes more spurious changes, which then end up becoming part of the long term branch state. These are then are persistant sources of merge conflicts in future merges. Ideally I could globally use the CVS -kb option on checkout/update to prevent all keyword expansion, but the CVS docs are very unclear on the actual effect of that, e.g what would the actual value of existing embedded keywords (in existing code, or new code committed by people who _didn't_ globally force -kb, i.e., most people)? -Miles -- "Whatever you do will be insignificant, but it is very important that you do it." Mahatma Ghandi