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: Wed, 25 Nov 2015 20:16:55 +0200 Message-ID: <83si3uvt9k.fsf@gnu.org> References: <56538D97.80905@cs.ucla.edu> <87bnakgwvq.fsf@isaac.fritz.box> <83twobxn7e.fsf@gnu.org> <5654BE83.7010608@cs.ucla.edu> <83h9kbxih6.fsf@gnu.org> <5654DEE6.4080409@cs.ucla.edu> <87si3uq5jz.fsf@isaac.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1448475498 8009 80.91.229.3 (25 Nov 2015 18:18:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Nov 2015 18:18:18 +0000 (UTC) Cc: eggert@cs.ucla.edu, bruce.connor.am@gmail.com, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 25 19:18:07 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 1a1edr-0002qt-0g for ged-emacs-devel@m.gmane.org; Wed, 25 Nov 2015 19:18:07 +0100 Original-Received: from localhost ([::1]:47060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1eds-0001yk-So for ged-emacs-devel@m.gmane.org; Wed, 25 Nov 2015 13:18:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1edm-0001yc-I1 for emacs-devel@gnu.org; Wed, 25 Nov 2015 13:18:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1edh-0007A9-FU for emacs-devel@gnu.org; Wed, 25 Nov 2015 13:18:02 -0500 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:33181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1edh-000799-7R for emacs-devel@gnu.org; Wed, 25 Nov 2015 13:17:57 -0500 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NYD00O00UK5JY00@mtaout29.012.net.il> for emacs-devel@gnu.org; Wed, 25 Nov 2015 20:16:25 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NYD00GZ4URDQR70@mtaout29.012.net.il>; Wed, 25 Nov 2015 20:16:25 +0200 (IST) In-reply-to: <87si3uq5jz.fsf@isaac.fritz.box> 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.185 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:195236 Archived-At: > From: David Engster > Cc: Eli Zaretskii , bruce.connor.am@gmail.com, emacs-devel@gnu.org > Date: Wed, 25 Nov 2015 01:35:44 +0100 > > Paul Eggert writes: > > 1. make change-history > > > > 2. Now ChangeLog.3 is up-to-date. Merge emacs-25 into the master; > > this updates ChangeLog.2 without changing ChangeLog.3. > > > > 3. Now ChangeLog.2 is up-to-date, but 'make change-history' would > > screw up ChangeLog.3. Prevent this screwup by editing ChangeLog.3 to > > say that it records revisions to the current master commit > > (inclusive). > > > > Easy, huh? :-) > > So in the end, you have ChangeLog.2 and ChangeLog.3 in master which are > tracking changes from different branches in parallel, i.e., for the same > time span. Isn't that a problem? We won't release from master, so the problem is not so significant, I think. When branching, we might need to do something about that, but that's a rare event.