From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Nicolas Petton <nicolas@petton.fr>
Cc: emacs-devel@gnu.org
Subject: Re: How to update the ChangeLog files in emacs-25?
Date: Mon, 25 Jan 2016 11:07:49 -0500 [thread overview]
Message-ID: <jwv1t95y79u.fsf-monnier+Inbox@gnu.org> (raw)
In-Reply-To: <87powphdlf.fsf@petton.fr> (Nicolas Petton's message of "Mon, 25 Jan 2016 16:40:28 +0100")
>>> Ok, I'll remove the check then if that's ok with you.
>> Better keep the check and just override it locally for this one time.
> But then it means to me that updating the ChangeLogs on emacs-25 is something
> that we should avoid doing,
Indeed we should (where possible), because it creates merge conflicts
when the branch is merged back into master.
> which sounds strange (and I'll have to do it for each pretest, then RC
> and release, so it looks like it's something that we should allow).
I understand that. So either you temporarily override the check
(deciding that it's worthwhile to cause conflicts further down), or you
find a new way that avoids the conflicts (e.g. putting the ChangeLog
entries in a different file from the one used in master).
Stefan
next prev parent reply other threads:[~2016-01-25 16:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-24 11:55 How to update the ChangeLog files in emacs-25? Nicolas Petton
2016-01-24 14:53 ` Eli Zaretskii
2016-01-24 20:39 ` Nicolas Petton
2016-01-24 20:43 ` Eli Zaretskii
2016-01-24 23:48 ` Nicolas Petton
2016-01-25 0:22 ` Paul Eggert
2016-01-25 8:18 ` Nicolas Petton
2016-01-25 13:02 ` Stefan Monnier
2016-01-25 15:40 ` Nicolas Petton
2016-01-25 16:07 ` Stefan Monnier [this message]
2016-01-25 16:10 ` Eli Zaretskii
2016-01-25 16:13 ` Paul Eggert
2016-01-26 1:55 ` Xue Fuqiao
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=jwv1t95y79u.fsf-monnier+Inbox@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=nicolas@petton.fr \
/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).