From: David Engster <deng@randomsample.de>
To: Eli Zaretskii <eliz@gnu.org>
Cc: schwab@suse.de, eggert@cs.ucla.edu, emacs-devel@gnu.org, rgm@gnu.org
Subject: Re: make change-history on non-master branches
Date: Thu, 19 Nov 2015 21:57:07 +0100 [thread overview]
Message-ID: <87d1v5k8rg.fsf@isaac.fritz.box> (raw)
In-Reply-To: <83wptd7mif.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 19 Nov 2015 22:38:32 +0200")
Eli Zaretskii writes:
>> From: David Engster <deng@randomsample.de>
>> Cc: Andreas Schwab <schwab@suse.de>, 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
next prev parent reply other threads:[~2015-11-19 20:57 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-15 2:15 make change-history on non-master branches Glenn Morris
2015-11-15 7:11 ` Paul Eggert
2015-11-16 16:02 ` Eli Zaretskii
2015-11-18 18:10 ` Glenn Morris
2015-11-18 18:19 ` Eli Zaretskii
2015-11-18 18:28 ` Glenn Morris
2015-11-18 18:46 ` Eli Zaretskii
2015-11-18 19:36 ` David Kastrup
2015-11-19 8:35 ` Andreas Schwab
2015-11-19 15:49 ` Eli Zaretskii
2015-11-19 16:35 ` Andreas Schwab
2015-11-19 17:02 ` Eli Zaretskii
2015-11-19 19:48 ` David Engster
2015-11-19 20:38 ` Eli Zaretskii
2015-11-19 20:57 ` David Engster [this message]
2015-11-20 0:31 ` Juanma Barranquero
2015-11-20 8:09 ` Eli Zaretskii
2015-11-20 16:38 ` Future release schedules (was: make change-history on non-master branches) John Wiegley
2015-11-20 18:04 ` Eli Zaretskii
2015-11-20 18:15 ` Future release schedules John Wiegley
2015-11-20 18:41 ` Future release schedules (was: make change-history on non-master branches) Artur Malabarba
2015-11-20 18:43 ` Artur Malabarba
2015-11-20 18:49 ` Eli Zaretskii
2015-11-20 19:05 ` Eli Zaretskii
2015-11-20 19:14 ` Future release schedules John Wiegley
2015-11-20 21:16 ` Eli Zaretskii
2015-11-20 21:33 ` John Wiegley
2015-11-21 11:14 ` Eli Zaretskii
2015-11-18 19:22 ` make change-history on non-master branches Eli Zaretskii
2015-11-18 20:38 ` Glenn Morris
2015-12-20 18:53 ` Glenn Morris
2015-12-20 21:21 ` Paul Eggert
2015-12-21 0:30 ` Glenn Morris
2015-12-23 1:12 ` John Wiegley
2015-12-23 7:58 ` Paul Eggert
2016-01-25 16:55 ` Glenn Morris
2016-01-25 17:22 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d1v5k8rg.fsf@isaac.fritz.box \
--to=deng@randomsample.de \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
--cc=schwab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).