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: make change-history on non-master branches Date: Thu, 19 Nov 2015 21:57:07 +0100 Message-ID: <87d1v5k8rg.fsf@isaac.fritz.box> References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> <83bnar9mcd.fsf@gnu.org> <83r3jm7zw1.fsf@gnu.org> <87lh9tkby8.fsf@isaac.fritz.box> <83wptd7mif.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447966663 11437 80.91.229.3 (19 Nov 2015 20:57:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Nov 2015 20:57:43 +0000 (UTC) Cc: schwab@suse.de, eggert@cs.ucla.edu, emacs-devel@gnu.org, rgm@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 19 21:57:33 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 1ZzWGq-0001r1-GF for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 21:57:32 +0100 Original-Received: from localhost ([::1]:44020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzWGq-0007Ym-16 for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 15:57:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzWGZ-0007VU-8P for emacs-devel@gnu.org; Thu, 19 Nov 2015 15:57:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzWGV-0007h3-2x for emacs-devel@gnu.org; Thu, 19 Nov 2015 15:57:15 -0500 Original-Received: from randomsample.de ([5.45.97.173]:54199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzWGU-0007gx-Py; Thu, 19 Nov 2015 15:57:11 -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=PrqKkIHjQFKFye1sLC9MybMJWPEQkaEuOFDtYecgR24=; b=fHk9jf/FIsEAD/OXGKbNg7/WglMIbRlYMo5ORDwEqUlxJQQ0Yo7MC7rYa6NvfgfB0A2QqptWLLy/rKVO1kjvJz8tIwHHT4YUJJ7cDrt8YxQeozo7dpnAzD3wPoVlhGKv; 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 1ZzWGS-0007rQ-Rl; Thu, 19 Nov 2015 21:57:08 +0100 In-Reply-To: <83wptd7mif.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 19 Nov 2015 22:38:32 +0200") 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:194822 Archived-At: Eli Zaretskii writes: >> From: David Engster >> Cc: Andreas Schwab , rgm@gnu.org, >> eggert@cs.ucla.edu, emacs-devel@gnu.org > >> Date: Thu, 19 Nov 2015 20:48:15 +0100 >> >> For further ChangeLog updates, at least in the current form, I don't see >> how to automate this. IMHO, for automatic merges, we would need the >> following: >> >> - Generating the ChangeLog on the 'master' branch ignores commits from >> emacs-25 merges. >> >> - Generating the ChangeLog on the 'emacs-25' branch ignores cherry-picks >> from 'master' (can be detected by git or through a magic word in the >> commit message). >> >> - when cherry-picking from 'master', we copy the generated&fixed >> ChangeLog entry and commit it separately. Then gitmerge.el could skip >> that during the merge into master, just like it skips the backported >> commit itself. > > I'm not sure I understand the practical meaning of the last item > (which AFAIU is the only one that needs to be done by humans). You > seem to say that each cherry-pick should require an update to > ChangeLog.2 both on master and on emacs-25, and application of fixes > to them? Yes. > Normally, ChangeLog.2 is updated once a week from Git, and then > whoever has a habit of looking at the results makes corrections there > when they feel like it. So there's no guarantee that the corrected > entry is in place when you cherry-pick. Moreover, the person who > cherry-picks does not necessarily know whether the log message of the > cherry-picked commit needs fixing, or how to fix it. I'm aware of these problems. But if you simply cherry-pick and let 'make change-history' do its job on both branches, you will have to fix the ChangeLog entry twice (preferably the same way), and you'll get a conflict when you merge emacs-25 into master. -David