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: Thu, 19 Nov 2015 17:49:34 +0200 Message-ID: <83r3jm7zw1.fsf@gnu.org> References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> <83bnar9mcd.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447948224 27600 80.91.229.3 (19 Nov 2015 15:50:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Nov 2015 15:50:24 +0000 (UTC) Cc: rgm@gnu.org, eggert@cs.ucla.edu, emacs-devel@gnu.org To: Andreas Schwab , David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 19 16:50:16 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 1ZzRTU-0006ON-NE for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 16:50:16 +0100 Original-Received: from localhost ([::1]:42568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzRTU-0007bp-0r for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 10:50:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzRTB-0007am-B0 for emacs-devel@gnu.org; Thu, 19 Nov 2015 10:49:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzRT5-0000qK-JW for emacs-devel@gnu.org; Thu, 19 Nov 2015 10:49:57 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:43043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzRT5-0000qG-Bi; Thu, 19 Nov 2015 10:49:51 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NY200M00JEQ1100@mtaout27.012.net.il>; Thu, 19 Nov 2015 17:44:50 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NY200KEUJQPJQ20@mtaout27.012.net.il>; Thu, 19 Nov 2015 17:44:50 +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:194791 Archived-At: > From: Andreas Schwab > Cc: Glenn Morris , eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Thu, 19 Nov 2015 09:35:50 +0100 > > Eli Zaretskii writes: > > >> 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. > > You get a merge conflict. Even if I have git-merge-changelog installed? > > Perhaps Git gurus could help us out? Andreas, any suggestions? > > You need to resolve the merge conflict one way or the other. Thanks. Maybe we could get some help from gitmerge.el, even if that would require some specific pattern in the log messages of commits that correct ChangeLog.2. David, WDYT?