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: When do we merge the commits from emacs-25 onto master? Date: Tue, 24 Nov 2015 22:14:45 +0200 Message-ID: <83h9kbxih6.fsf@gnu.org> References: <56538D97.80905@cs.ucla.edu> <87bnakgwvq.fsf@isaac.fritz.box> <83twobxn7e.fsf@gnu.org> <5654BE83.7010608@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1448396128 17790 80.91.229.3 (24 Nov 2015 20:15:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Nov 2015 20:15:28 +0000 (UTC) Cc: bruce.connor.am@gmail.com, deng@randomsample.de, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 24 21:15:18 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 1a1Jzg-0003C8-Ar for ged-emacs-devel@m.gmane.org; Tue, 24 Nov 2015 21:15:16 +0100 Original-Received: from localhost ([::1]:41187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Jzh-0004WG-Iw for ged-emacs-devel@m.gmane.org; Tue, 24 Nov 2015 15:15:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1JzO-0004Vz-Kx for emacs-devel@gnu.org; Tue, 24 Nov 2015 15:15:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1JzL-0007po-Cr for emacs-devel@gnu.org; Tue, 24 Nov 2015 15:14:58 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:60980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1JzL-0007pg-52 for emacs-devel@gnu.org; Tue, 24 Nov 2015 15:14:55 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NYC00D00578OX00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Tue, 24 Nov 2015 22:14:47 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NYC00DST5KMC5A0@a-mtaout20.012.net.il>; Tue, 24 Nov 2015 22:14:47 +0200 (IST) In-reply-to: <5654BE83.7010608@cs.ucla.edu> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:195187 Archived-At: > Cc: bruce.connor.am@gmail.com, emacs-devel@gnu.org > From: Paul Eggert > Date: Tue, 24 Nov 2015 11:46:11 -0800 > > > Would it work to somehow teach gitmerge.el to use the (fixed) text > > from ChangeLog.2 as the merge-commit log message, instead of the > > original log message at emacs-25 commit time? > > A clever idea, and something like that might work, but it sounds > brittle. Often, changes to ChangeLog.2 aren't isolated to single > commits, and offhand I don't see how in general to figure out which > parts of ChangeLog.2 should be matched to which commits. We shouldn't pay attention to _commits_ that change ChangeLog.2, we should instead match Git log messages against entries in the ChangeLog.2 the file in the working tree. > How about the following idea instead. Let's put the emacs-25 branch in > charge of ChangeLog.2, and put the master branch in charge of a new file > ChangeLog.3 that exists only in the master branch. We can do this by > updating CHANGELOG_HISTORY_INDEX_MAX to 3 only in the master. Then > merges from emacs-25 to master should be trivial, as people who want to > manually edit ChangeLog.2 or to update it via 'make change-history' > should do so only in the emacs-25 branch. We'll need to modify 'make > ChangeLog' so that in the master it ignores commit messages merged from > the emacs-25 branch (I assume this is doable but I haven't checked > this). Backporting changes will still be a hassle (we'll need to run > 'make change-history' in the master, and then manually update > ChangeLog.3 to remove references to the changes being backported to > emacs-25), but that's OK. You mean, "make change-history" on master will update ChangeLog.3 and the same command on the branch will update ChangeLog.2? But then how to prevent the commit log messages from commits merged onto master from appearing in ChangeLog.3?