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 20:46:58 +0200 Message-ID: <83bnar9mcd.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 1447872654 29748 80.91.229.3 (18 Nov 2015 18:50:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Nov 2015 18:50:54 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Glenn Morris , Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 18 19:50:44 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 1Zz7oZ-0007wF-8Q for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 19:50:43 +0100 Original-Received: from localhost ([::1]:37669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7oY-0008Q8-NL for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 13:50:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7mA-0004dz-WF for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:48:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz7m7-0000Oi-Ot for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:48:14 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:37773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7m7-0000OX-C0; Wed, 18 Nov 2015 13:48:11 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NY000500XAJOC00@mtaout26.012.net.il>; Wed, 18 Nov 2015 20:50:06 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NY0001O6XNIP940@mtaout26.012.net.il>; Wed, 18 Nov 2015 20:50:06 +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.182 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:194741 Archived-At: > From: Glenn Morris > Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Wed, 18 Nov 2015 13:28:08 -0500 > > 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. I agree. Perhaps Git gurus could help us out? Andreas, any suggestions? TIA