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 19:02:34 +0200 Message-ID: <83io4x9b2t.fsf@gnu.org> References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> <83bnar9mcd.fsf@gnu.org> <83r3jm7zw1.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447952613 5690 80.91.229.3 (19 Nov 2015 17:03:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Nov 2015 17:03:33 +0000 (UTC) Cc: rgm@gnu.org, eggert@cs.ucla.edu, deng@randomsample.de, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 19 18:03:24 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 1ZzScE-0003lR-8R for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 18:03:22 +0100 Original-Received: from localhost ([::1]:43065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzScD-0003LR-Hh for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 12:03:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzSbo-00037h-Ks for emacs-devel@gnu.org; Thu, 19 Nov 2015 12:02:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzSbk-0006Dm-N8 for emacs-devel@gnu.org; Thu, 19 Nov 2015 12:02:56 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:48459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzSbk-0006DM-Fu; Thu, 19 Nov 2015 12:02:52 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NY200I00N1E5D00@mtaout26.012.net.il>; Thu, 19 Nov 2015 19:05:52 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NY200ALJNHRBT80@mtaout26.012.net.il>; Thu, 19 Nov 2015 19:05:52 +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:194801 Archived-At: > From: Andreas Schwab > Cc: David Engster , rgm@gnu.org, eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Thu, 19 Nov 2015 17:35:44 +0100 > > >> >> 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? > > I don't know, but I would be surprised if it could handle that > correctly. Yes, that's exactly what I'm afraid of: a conflict-less merge that does the wrong thing. Thanks.