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: Mon, 16 Nov 2015 18:02:55 +0200 Message-ID: <831tbqc4pc.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447713989 8083 80.91.229.3 (16 Nov 2015 22:46:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 16 Nov 2015 22:46:29 +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 Mon Nov 16 23:46:23 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 1ZySXV-0001yD-N7 for ged-emacs-devel@m.gmane.org; Mon, 16 Nov 2015 23:46:21 +0100 Original-Received: from localhost ([::1]:51579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZySXV-00035m-5b for ged-emacs-devel@m.gmane.org; Mon, 16 Nov 2015 17:46:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyMFG-0003Aq-0d for emacs-devel@gnu.org; Mon, 16 Nov 2015 11:03:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyMFA-0002zb-VJ for emacs-devel@gnu.org; Mon, 16 Nov 2015 11:03:05 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:46360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyMFA-0002zC-NJ; Mon, 16 Nov 2015 11:03:00 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NXX00D000ATB700@mtaout25.012.net.il>; Mon, 16 Nov 2015 18:00:28 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXX007I90GSRE50@mtaout25.012.net.il>; Mon, 16 Nov 2015 18:00:28 +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.181 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:194580 Archived-At: > From: Glenn Morris > Date: Sat, 14 Nov 2015 21:15:57 -0500 > Cc: emacs-devel@gnu.org > > 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.