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:19:10 +0200 Message-ID: <83egfn9nmp.fsf@gnu.org> References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447870773 30975 80.91.229.3 (18 Nov 2015 18:19:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Nov 2015 18:19:33 +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 19:19: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 1Zz7KG-00018f-8u for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 19:19:24 +0100 Original-Received: from localhost ([::1]:37478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7KF-0007mr-Nt for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 13:19:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7KC-0007mb-CA for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:19:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz7K9-0001A1-8e for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:19:20 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:36232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7K9-00019q-0G; Wed, 18 Nov 2015 13:19:17 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NY000O00VSAPS00@mtaout27.012.net.il>; Wed, 18 Nov 2015 20:14:16 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NY000O4JVZR5C10@mtaout27.012.net.il>; Wed, 18 Nov 2015 20:14:16 +0200 (IST) In-reply-to: <9ta8qb5gcc.fsf@fencepost.gnu.org> 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:194734 Archived-At: > From: Glenn Morris > Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Wed, 18 Nov 2015 13:10:11 -0500 > > Eli Zaretskii wrote: > > >> And the resulting ChangeLog.2 entries (and more importantly, any > >> corrections) will have to be merged to master, just like in the old days? > > > > Maybe I'm missing something, but why do we have to merge it? Won't > > "make change-history" create on each branch the file that branch > > wants? > > > > If we can avoid merging, we could teach gitmerge.el skip that file. > > The issue is the hand-written corrections. 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?