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: April 7 cutover for generating ChangeLog automatically Date: Tue, 31 Mar 2015 11:17:40 -0700 Organization: UCLA Computer Science Department Message-ID: <551AE4C4.6030305@cs.ucla.edu> References: <551A528C.7080008@cs.ucla.edu> <87a8yt2rcj.fsf@foretagsplatsen.se> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010409050809020607040302" X-Trace: ger.gmane.org 1427825894 3516 80.91.229.3 (31 Mar 2015 18:18:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 18:18:14 +0000 (UTC) Cc: Emacs Development To: Nicolas Petton Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 20:18:02 2015 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 1Yd0jd-0004EI-0a for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 20:17:57 +0200 Original-Received: from localhost ([::1]:40021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yd0jW-0006GQ-VM for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 14:17:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yd0jS-0006E4-VB for Emacs-devel@gnu.org; Tue, 31 Mar 2015 14:17:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yd0jO-0001dl-NE for Emacs-devel@gnu.org; Tue, 31 Mar 2015 14:17:46 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:48972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yd0jO-0001dX-EX for Emacs-devel@gnu.org; Tue, 31 Mar 2015 14:17:42 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 91E52A60009; Tue, 31 Mar 2015 11:17:41 -0700 (PDT) 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 EUaOIiEMzenA; Tue, 31 Mar 2015 11:17:40 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 72BA9A60008; Tue, 31 Mar 2015 11:17:40 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 In-Reply-To: <87a8yt2rcj.fsf@foretagsplatsen.se> 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:184664 Archived-At: This is a multi-part message in MIME format. --------------010409050809020607040302 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 03/31/2015 07:07 AM, Nicolas Petton wrote: > Does it mean that the ChangeLog files won't be updated anymore or that > they will be updated only from time to time (like right before a release > or something like that)? The latter. The ChangeLog history files (ChangeLog.1, etc.) will be updated only when someone feels like updating them, either by editing them manually and committing the changes, or by running 'make change-history'. 'make change-history' will prepend copies of recent commit messages to ChangeLog.1, thus causing those commit messages to no longer be considered "recent". There will be only one file called 'ChangeLog', at the top level. You can generate it automatically from recent commit messages by running 'make ChangeLog', but intent is that it is an output file and is not committed to the repository. (Unlike 'make change-history', 'make ChangeLog' doesn't cause the commits to be considered "recent".) 'make dist' uses 'make ChangeLog' to create the ChangeLog file that is put into the tarball. > I think that admin/make-tarball.txt will have to be updated. Yes, that's part of the patch proposed in Bug#19113. Please see: http://bugs.gnu.org/19113#119 I'm attaching the part that updates make-tarball.txt. --------------010409050809020607040302 Content-Type: text/x-patch; name="make-tarball.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="make-tarball.diff" diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 8f8b031..2fe3b69 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -31,28 +31,30 @@ General steps (for each step, check for possible errors): M-x authors RET If there is an "*Authors Errors*" buffer, address the issues. - If there was a ChangeLog typo, fix it. If a file was deleted or - renamed, consider adding an appropriate entry to authors-ignored-files, + If there was a ChangeLog typo, run "make change-history" and then + fix ChangeLog.1. If a file was deleted or renamed, consider + adding an appropriate entry to authors-ignored-files, authors-valid-file-names, or authors-renamed-files-alist. If necessary, repeat M-x authors after making those changes. Save the "*Authors*" buffer as etc/AUTHORS. Check the diff looks reasonable. Maybe add entries to authors-ambiguous-files or authors-aliases, and repeat. - Commit any fixes to ChangeLogs or authors.el. + Commit any fixes to authors.el. 3. Set the version number (M-x load-file RET admin/admin.el RET, then M-x set-version RET). For a release, add released ChangeLog - entries (M-x add-release-logs RET). + entries (create a ChangeLog symlink a la vc-dwim, then run M-x + add-release-logs RET, then run the shell command 'vc-dwim --commit'). For a pretest, start at version .90. After .99, use .990 (so that it sorts). The final pretest should be a release candidate. Set the version number to that of the actual release. Pick a date about a week - from now when you intend to make the release. Use M-x add-release-logs - to add the ChangeLog entries for that date to the tar file (but - not yet to the repository). Name the tar file as + from now when you intend to make the release. Use vc-dwim and + M-x add-release-logs as described above to add the ChangeLog + entries for that date to the tar file. Name the tar file as emacs-XX.Y-rc1.tar. If all goes well in the following week, you can simply rename the file and use it for the actual release. --------------010409050809020607040302--