From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Should we restore manually maintained ChangeLogs (was: Is it time to drop ChangeLogs?) Date: Mon, 07 Mar 2016 19:50:24 +0200 Message-ID: <83lh5utbxb.fsf@gnu.org> References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83vb50wxhv.fsf@gnu.org> <87y49vz4cg.fsf@acer.localhost.com> <87vb4zb0i4.fsf@gnu.org> <837fheuu6a.fsf@gnu.org> <83twkiteb3.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457373044 5023 80.91.229.3 (7 Mar 2016 17:50:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 7 Mar 2016 17:50:44 +0000 (UTC) Cc: mthl@gnu.org, emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 07 18:50:39 2016 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 1aczIh-00035J-Ia for ged-emacs-devel@m.gmane.org; Mon, 07 Mar 2016 18:50:35 +0100 Original-Received: from localhost ([::1]:57507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aczIh-00057B-2C for ged-emacs-devel@m.gmane.org; Mon, 07 Mar 2016 12:50:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aczIY-0004zU-Nk for emacs-devel@gnu.org; Mon, 07 Mar 2016 12:50:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aczIU-0006te-N6 for emacs-devel@gnu.org; Mon, 07 Mar 2016 12:50:26 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aczIQ-0006s8-W2; Mon, 07 Mar 2016 12:50:19 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1455 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aczIQ-00053d-72; Mon, 07 Mar 2016 12:50:18 -0500 In-reply-to: (message from John Wiegley on Mon, 07 Mar 2016 09:16:27 -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.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:201065 Archived-At: > From: John Wiegley > Date: Mon, 07 Mar 2016 09:16:27 -0800 > Cc: mthl@gnu.org, emacs-devel@gnu.org > > Given that there are active developers who appreciate and use the ChangeLog > format, I don't think we are going to remove them just yet. Instead, the > question has been raised as to whether we should go back to maintaining > ChangeLog files manually, or continue to generate them from version control as > we do now. > > My vote is to continue generating from version control, and Eli would like to > go back to direct maintenance. What do others think? My vote is to go back to having ChangeLog files (could be a single file, though) in the repository. My reasons: . The current system is clearly not working well: the mistakes in the log messages are not corrected, and there's an unsolved problem of merging from the release branch to master. . Other projects maintain ChangeLog files in the repository: GCC, Binutils, GDB, glibc, Texinfo, XEmacs, to name just those that I know about. . We have maintained ChangeLog files in the repo for years, and I don't remember this ever being a problem, provided that a proper merge tool (git-merge-changelog for Git) is installed.