From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: When do we merge the commits from emacs-25 onto master? Date: Wed, 25 Nov 2015 01:35:44 +0100 Message-ID: <87si3uq5jz.fsf@isaac.fritz.box> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1448411777 30916 80.91.229.3 (25 Nov 2015 00:36:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Nov 2015 00:36:17 +0000 (UTC) Cc: Eli Zaretskii , bruce.connor.am@gmail.com, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 25 01:36:06 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 1a1O43-00007g-AT for ged-emacs-devel@m.gmane.org; Wed, 25 Nov 2015 01:36:03 +0100 Original-Received: from localhost ([::1]:42239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1O44-0004bf-NF for ged-emacs-devel@m.gmane.org; Tue, 24 Nov 2015 19:36:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1O41-0004bL-Ne for emacs-devel@gnu.org; Tue, 24 Nov 2015 19:36:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1O3y-0001jX-EZ for emacs-devel@gnu.org; Tue, 24 Nov 2015 19:36:01 -0500 Original-Received: from randomsample.de ([5.45.97.173]:60659) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1O3y-0001gZ-6o; Tue, 24 Nov 2015 19:35:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=CPDE8I/iCUckbyQYrOoT1j7WuLENiVUl8xoSqUK6vnE=; b=mRfl/DFtwq2xWGwLgDeDhNUh0wPl6RIu2u3S5UfqNL80ANb1Csk6AOxEybOCCytc91+KTJfc+s+ubPLTorV+op30Utr3OdjNP/f6OyGAtPAbGyTX6II7ABTd3V9lCFaX; Original-Received: from ip4d1645ea.dynamic.kabel-deutschland.de ([77.22.69.234] helo=isaac.fritz.box) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1a1O3q-000537-TK; Wed, 25 Nov 2015 01:35:50 +0100 In-Reply-To: <5654DEE6.4080409@cs.ucla.edu> (Paul Eggert's message of "Tue, 24 Nov 2015 14:04:22 -0800") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:195199 Archived-At: 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? -David