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: make change-history on non-master branches Date: Wed, 18 Nov 2015 13:28:08 -0500 Message-ID: References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447871312 7881 80.91.229.3 (18 Nov 2015 18:28:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Nov 2015 18:28:32 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 18 19:28:27 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 1Zz7Sy-00071g-TL for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 19:28:25 +0100 Original-Received: from localhost ([::1]:37529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7Sy-000581-8l for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 13:28:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7Sl-00057h-N9 for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:28:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz7Sk-00038o-QQ for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:28:11 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7Sj-00038b-GG; Wed, 18 Nov 2015 13:28:09 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Zz7Si-0000cW-HA; Wed, 18 Nov 2015 13:28:08 -0500 X-Spook: Blizzard broadside BLU-114/B FMD Serbian Watch NWO X-Ran: _{[\w (Eli Zaretskii's message of "Wed, 18 Nov 2015 20:19:10 +0200") 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:194736 Archived-At: Eli Zaretskii wrote: > Right. But if we merge ChangeLog.2 from the release branch to master, > then this will produce a mess when "make change-history" is run on > master, no? I mean, some entries will appear twice, once after > corrections, the other without. No? 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.)