From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Nick Roberts Newsgroups: gmane.emacs.devel Subject: Re: deleting rcs keywords from emacs sources Date: Tue, 23 Mar 2004 18:07:33 +0000 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <16480.31973.733974.765940@nick.uklinux.net> References: <5192113.1080035471618.JavaMail.root@tintin.london.ongenie.net> <20040323122810.7979.JMBARRANQUERO@wke.es> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1080066588 24285 80.91.224.253 (23 Mar 2004 18:29:48 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 23 Mar 2004 18:29:48 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue Mar 23 19:29:37 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 1B5qef-0002ph-00 for ; Tue, 23 Mar 2004 19:29:37 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B5qee-0000Te-00 for ; Tue, 23 Mar 2004 19:29:36 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B5qcb-0004JE-Rf for emacs-devel@quimby.gnus.org; Tue, 23 Mar 2004 13:27:29 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B5qcI-0004FX-4k for emacs-devel@gnu.org; Tue, 23 Mar 2004 13:27:10 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B5qbi-0003xj-OQ for emacs-devel@gnu.org; Tue, 23 Mar 2004 13:27:05 -0500 Original-Received: from [194.247.51.192] (helo=nick.uklinux.net) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B5qbg-0003wk-B5 for emacs-devel@gnu.org; Tue, 23 Mar 2004 13:26:34 -0500 Original-Received: by nick.uklinux.net (Postfix, from userid 501) id 0A73075FDE; Tue, 23 Mar 2004 18:07:34 +0000 (GMT) Original-To: Juanma Barranquero In-Reply-To: <20040323122810.7979.JMBARRANQUERO@wke.es> X-Mailer: VM 6.97 under Emacs 21.2.1 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:20811 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20811 > Now, if we switched from CVS to Subversion, we could have our cake and > eat it too (in Subversion, keywords don't cause spurious > conflicts/differences). Whatever the advantages of Subversion (or Arch), keywords would not appear to be one of them because the info manual on CVS says: info> If you merge files containing keywords (*note Keyword info> substitution::), you will normally get numerous conflicts during the info> merge, because the keywords are expanded differently in the revisions info> which you are merging. info> Therefore, you will often want to specify the `-kk' (*note info> Substitution modes::) switch to the merge command line. By info> substituting just the name of the keyword, not the expanded value of info> that keyword, this option ensures that the revisions which you are info> merging will be the same as each other, and avoid spurious conflicts. eg. cvs update -kk -j mybranch There is a caution: info> There is, however, one major caveat with using `-kk' on merges. info> Namely, it overrides whatever keyword expansion mode CVS would normally info> have used. In particular, this is a problem if the mode had been `-kb' info> for a binary file. Therefore, if your repository contains binary info> files, you will need to deal with the conflicts rather than using `-kk'. The only binary files that I'm aware of in Emacs CVS are the bitmaps for the toolbar. Nick