From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Generating the ChangeLog files from the commit messages Date: Thu, 20 Nov 2014 23:57:39 -0800 Organization: UCLA Computer Science Department Message-ID: <546EF073.1020001@cs.ucla.edu> References: <21606.10799.112099.788101@a1i15.kph.uni-mainz.de> <1753218.Ot8JCqssfN@descartes> <546AABCF.8030705@cs.ucla.edu> <9xioico2nm.fsf@fencepost.gnu.org> <83k32s9zm5.fsf@gnu.org> <546BC2C6.50909@cs.ucla.edu> <546D3287.7070802@cs.ucla.edu> <546D5CBA.2010200@cs.ucla.edu> <546E4B47.50506@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1416556704 5632 80.91.229.3 (21 Nov 2014 07:58:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2014 07:58:24 +0000 (UTC) Cc: Emacs development discussions To: Kelvin White Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 21 08:58:18 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xrj6d-0007JM-NB for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 08:58:15 +0100 Original-Received: from localhost ([::1]:38949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrj6d-0007ZA-DE for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 02:58:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrj6T-0007Yr-4c for emacs-devel@gnu.org; Fri, 21 Nov 2014 02:58:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xrj6L-0003v1-LQ for emacs-devel@gnu.org; Fri, 21 Nov 2014 02:58:05 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:49611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrj6L-0003nS-Dd for emacs-devel@gnu.org; Fri, 21 Nov 2014 02:57:57 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 6BEA1A60070; Thu, 20 Nov 2014 23:57:48 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u7hNE5x9emjp; Thu, 20 Nov 2014 23:57:39 -0800 (PST) Original-Received: from [192.168.1.9] (pool-71-177-17-123.lsanca.dsl-w.verizon.net [71.177.17.123]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id B6F4BA6000D; Thu, 20 Nov 2014 23:57:39 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177914 Archived-At: Kelvin White wrote: > there is a separate ChangeLog file in the lisp/erc > directory. How would I deal with this regarding this topic. Should it be > merged or removed? The idea is that lisp/erc files could be maintained just as other files are, i.e., changes to them should be accompanied by commit messages in ChangeLog format. This will require a change in practice when committing erc changes. For example, the message for your commit ea283d2 dated November 9 was merely "Update version to 24.5", and this commit altered lisp/erc/ChangeLog. Under the proposed procedure, the commit message would instead use ChangeLog format preceded by a summary line and a blank line, e.g.: Update Emacs version for erc. * lisp/erc/erc-match.el, lisp/erc/erc-join.el, lisp/erc/erc-stamp.el: * lisp/erc/erc-backend.el, lisp/erc/erc.el, lisp/erc/erc-button.el: Update version to 24.5. (but not indented), and there would be no change to the ChangeLog because there would be no ChangeLog file in the repository. As a historical matter, lisp/erc/ChangeLog would be renamed to lisp/erc/ChangeLog.09 and wouldn't change thereafter.