From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Robert J. Chassell" Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog? Date: Fri, 4 Mar 2005 13:42:55 +0000 (UTC) Message-ID: References: <61k6osjqsz.fsf@fencepost.gnu.org> Reply-To: bob@rattlesnake.com NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1109945356 8669 80.91.229.2 (4 Mar 2005 14:09:16 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 4 Mar 2005 14:09:16 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 04 15:09:16 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1D7DPd-0004E7-80 for ged-emacs-devel@m.gmane.org; Fri, 04 Mar 2005 15:04:17 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D7Dio-0003MQ-0L for ged-emacs-devel@m.gmane.org; Fri, 04 Mar 2005 09:24:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1D7DfO-0001w8-UF for emacs-devel@gnu.org; Fri, 04 Mar 2005 09:20:35 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1D7DfN-0001vk-VG for emacs-devel@gnu.org; Fri, 04 Mar 2005 09:20:34 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D7DfE-0001ac-M2 for emacs-devel@gnu.org; Fri, 04 Mar 2005 09:20:24 -0500 Original-Received: from [69.168.108.225] (helo=rattlesnake.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1D7D51-0005fs-OO for emacs-devel@gnu.org; Fri, 04 Mar 2005 08:42:59 -0500 Original-Received: by rattlesnake.com via sendmail from stdin id (Debian Smail3.2.0.115) Fri, 4 Mar 2005 13:42:55 +0000 (UTC) Original-To: emacs-devel@gnu.org In-reply-to: (message from Miles Bader on Fri, 4 Mar 2005 10:35:16 +0900) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: main.gmane.org gmane.emacs.devel:34172 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:34172 Miles Bader wrote, ... I've read the info file now, and it seems pretty explicit and clear about the distinction between the two types of logs. Yes. I wrote that text years and years ago with wording intended to create such a distinction. At that time, when people referred to a `change log', it was often difficult to determine to which of several types of change log they refered. I am glad to see that the distinction has taken hold and that when an expert says `change log' (which can be written in various ways), he or she means only the more general change log and not the per-file change log modified by CVS. This suggests a change in the documentation in emacs/man/files.texi Types of Log File that is different from what I previously suggested. You might want to change this proposed wording to include references to Arch and Subversion and perhaps to other version control systems. I do not know anything about them and and written this with that ignorance in mind. This new wording replaces the last paragraph of the node, the paragraph that begins with the sentence When you use version control, you can use just the per-file log if you wish, or you can use both kinds of logs. Here is my current sample wording: Some projects use several different version control systems at the same time, synchronizing changes among them. In Emacs development under CVS, the practice is to record @emph{all} coding changes in the more general @file{ChangeLog} but not changes in documentation or in the @file{NEWS} and @file{FOR-RELEASE} files. Those latter changes are recorded only in the per-file log, a log which may be inaccessible to someone using a different version control system. (Other projects may work differently.) Thus, in Emacs development when both types of log are available and when recording changes in code, you should use @strong{both} the per-file log and the more general @file{ChangeLog} In such a situation you typically will want to write just one entry for each change. You can write the entry in @file{ChangeLog}, using the @kbd{C-x 4 a} command (@pxref{Change Log}), and then copy it to the per-file log, when that exists, buffer when you check in the change. Or, when using the @kbd{C-x v v} command (@pxref{Log Buffer}), you can write the entry in the per-file log buffer while checking in the change, and later use the @kbd{C-x v a} command to copy it to the more general @file{ChangeLog} (@pxref{Change Logs and VC}). -- Robert J. Chassell bob@rattlesnake.com GnuPG Key ID: 004B4AC8 http://www.rattlesnake.com http://www.teak.cc