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: make change-history on non-master branches Date: Wed, 18 Nov 2015 21:22:46 +0200 Message-ID: <837flf9kop.fsf@gnu.org> References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447874609 30381 80.91.229.3 (18 Nov 2015 19:23:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Nov 2015 19:23:29 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 18 20:23:20 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 1Zz8K6-0006yT-JI for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 20:23:18 +0100 Original-Received: from localhost ([::1]:37900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz8K5-0001Ka-Rt for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 14:23:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz8Jn-0001Ie-Oh for emacs-devel@gnu.org; Wed, 18 Nov 2015 14:23:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz8Jj-00023q-Qw for emacs-devel@gnu.org; Wed, 18 Nov 2015 14:22:59 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:53019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz8Jj-00023Z-Iz; Wed, 18 Nov 2015 14:22:55 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NY000B00YLUSC00@mtaout27.012.net.il>; Wed, 18 Nov 2015 21:17:54 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NY000BP8YXU9410@mtaout27.012.net.il>; Wed, 18 Nov 2015 21:17:54 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 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:194745 Archived-At: > From: Glenn Morris > Date: Wed, 18 Nov 2015 13:28:08 -0500 > Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org > > Quite possibly. I don't know exactly what happens if the commit hash > from the ChangeLog.2 footer were to get merged between branches. > > I don't know how to solve this problem, but it seems to me that it needs > to be solved, and the more master and emacs-25 diverge, the worse it > gets. > > (All I can say, which I know isn't helpful, is that if the corrections > were stored on a per commit-basis, this issue would not arise, AFAICS.) Btw, one other issue that needs to be taken care of is admin/authors.el, which needs to be taught about top-level ChangeLog.2 file.