From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog.3 in master Date: Thu, 08 Dec 2016 17:58:02 +0200 Message-ID: <83d1h2ifat.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1481212701 10430 195.159.176.226 (8 Dec 2016 15:58:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 8 Dec 2016 15:58:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 08 16:58:15 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cF15I-0001Fh-6l for ged-emacs-devel@m.gmane.org; Thu, 08 Dec 2016 16:58:12 +0100 Original-Received: from localhost ([::1]:47462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF15M-00046p-1B for ged-emacs-devel@m.gmane.org; Thu, 08 Dec 2016 10:58:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF14n-0003xC-0G for emacs-devel@gnu.org; Thu, 08 Dec 2016 10:57:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cF14i-0000xv-4V for emacs-devel@gnu.org; Thu, 08 Dec 2016 10:57:41 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF14i-0000xr-0S; Thu, 08 Dec 2016 10:57:36 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2369 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cF14h-0002PT-Al; Thu, 08 Dec 2016 10:57:35 -0500 In-reply-to: (message from Paul Eggert on Wed, 7 Dec 2016 13:01:51 -0800) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:210138 Archived-At: > From: Paul Eggert > Date: Wed, 7 Dec 2016 13:01:51 -0800 > > I merged emacs-25 into master again today. This time, I attempted to > cleanup the ChangeLog.2 mess in master, by creating a file ChangeLog.3 > (only in master) which attempts to keep log entries for the master > branch. The emacs-25 branch does not have a ChangeLog.3 file. The master > and emacs-25 branches should have identical ChangeLog.2 files > immediately after merging emacs-25 into master, because there should be > no reason to change ChangeLog.2 in master. (I hope this is all clear. :-) It is, and thanks for doing this. > Undoubtedly there will be further problems in this area, as the > ChangeLog stuff is still way too awkward. I'm mildly inclined to stop > updating ChangeLog files in the repository, and ask developers to use > something like 'make ChangeLog' if they want more-recent entries. I > realize not everyone agrees; on the other hand, ChangeLog.2 was becoming > fairly confusing in the master branch and ChangeLog.3 is not that much > better. I took a look at ChangeLog.3, and I don't see anything terribly wrong with it. As time goes by, these generated ChangeLog files acquire some duplications due to merges, but that's not a catastrophe, IMO. As for updating the file in the repository, it really is necessary when a release is tarred. So perhaps we don't need to do this on master, only on the release branch?