From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: master cbef1e9 2/3: ; make change-history-commit Date: Wed, 15 Apr 2015 13:32:19 -0400 Message-ID: References: <20150409172246.20602.44549@vcs.savannah.gnu.org> <5526E084.4060403@cs.ucla.edu> <552B6910.7090403@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1429119154 17255 80.91.229.3 (15 Apr 2015 17:32:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 15 Apr 2015 17:32:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 15 19:32:28 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 1YiRAq-0007XH-8a for ged-emacs-devel@m.gmane.org; Wed, 15 Apr 2015 19:32:28 +0200 Original-Received: from localhost ([::1]:33399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiRAp-0002pl-Gb for ged-emacs-devel@m.gmane.org; Wed, 15 Apr 2015 13:32:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiRAm-0002pe-3U for emacs-devel@gnu.org; Wed, 15 Apr 2015 13:32:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiRAi-0007LO-No for emacs-devel@gnu.org; Wed, 15 Apr 2015 13:32:24 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiRAi-0007LK-Kz for emacs-devel@gnu.org; Wed, 15 Apr 2015 13:32:20 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YiRAh-0005WF-M9; Wed, 15 Apr 2015 13:32:19 -0400 X-Spook: high security Cocaine Chobetsu Tony Blair mailbomb X-Ran: 9qS&ly=ZuWn0'jD4%:,f%}sj.;7M1uF30$l4K4k+Aupv\WvM8D;uj'*PX%jLhJmgH+cJ,' X-Hue: green X-Attribution: GM In-Reply-To: <552B6910.7090403@cs.ucla.edu> (Paul Eggert's message of "Sun, 12 Apr 2015 23:58:24 -0700") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:185472 Archived-At: Paul Eggert wrote: > ChangeLog.1 would contain top-level entries predating April 7, and > ChangeLog.2 would contain all entries between April 7 and the most > recent 'make change-history'. That sounds better to me. Eg I think it would make life easier for authors.el. >> Suppose we improve/change the ChangeLog generation script, and want to >> regenerate the generated ChangeLog. It will be difficult to extract the >> various corrections that have been applied by hand to the generated >> entries. > > That shouldn't be a problem, as the newly-generated ChangeLog > shouldn't include any hand-corrected entries. I seem to be persistently mis-communicating. Let me try again: In the repo right now, ChangeLog.1 contains entries generated from commit logs. It also contains some hand-written corrections to a few of those entries. Suppose we tweak the generation script, and want to regenerate _all_ entries from Apr 7. E.g. if bug#20325 gets fixed. It will be difficult to do that without losing the hand-written corrections. > No, the automatically-generated 'ChangeLog' entries start from the > last time 'make change-history' was run. Right. As I was saying, this is not how I expected it to work. I expected any corrections would be applied to the commit logs, not the generated C'log. Doing it the former way means the full C'log from Apr 7 can be regenerated whenever necessary, and also means there is no need to store entries that do not need to be corrected in the repo. I suggested using git notes for that, but it could just as well be a flat text file in admin/ that contains a list of (hash + corrected log for that hash). The generate script could check for an entry in that file. If there isn't one, use the commit log as-is. >> erc uses a non-standard scheme where .YY contains the entries for 20YY. > > Ah, sorry, I didn't know that. We could proceed as you suggest, > though we'd need to add a line to Makefile.in. Please see the second > attached patch (it's so large that I gzipped it). (I haven't tested > this either.) I haven't tested either, but sounds like the right idea to me.