From: Eli Zaretskii <eliz@gnu.org>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: emacs-devel@gnu.org
Subject: Re: ChangeLog.3 in master
Date: Thu, 08 Dec 2016 17:58:02 +0200 [thread overview]
Message-ID: <83d1h2ifat.fsf@gnu.org> (raw)
In-Reply-To: <d8e91758-ddf2-b870-6b37-bdd05aee0da1@cs.ucla.edu> (message from Paul Eggert on Wed, 7 Dec 2016 13:01:51 -0800)
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Wed, 7 Dec 2016 13:01:51 -0800
>
> I merged emacs-25 into master again today. This time, I attempted to
> cleanup the ChangeLog.2 mess in master, by creating a file ChangeLog.3
> (only in master) which attempts to keep log entries for the master
> branch. The emacs-25 branch does not have a ChangeLog.3 file. The master
> and emacs-25 branches should have identical ChangeLog.2 files
> immediately after merging emacs-25 into master, because there should be
> no reason to change ChangeLog.2 in master. (I hope this is all clear. :-)
It is, and thanks for doing this.
> Undoubtedly there will be further problems in this area, as the
> ChangeLog stuff is still way too awkward. I'm mildly inclined to stop
> updating ChangeLog files in the repository, and ask developers to use
> something like 'make ChangeLog' if they want more-recent entries. I
> realize not everyone agrees; on the other hand, ChangeLog.2 was becoming
> fairly confusing in the master branch and ChangeLog.3 is not that much
> better.
I took a look at ChangeLog.3, and I don't see anything terribly wrong
with it. As time goes by, these generated ChangeLog files acquire
some duplications due to merges, but that's not a catastrophe, IMO.
As for updating the file in the repository, it really is necessary
when a release is tarred. So perhaps we don't need to do this on
master, only on the release branch?
next prev parent reply other threads:[~2016-12-08 15:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 21:01 ChangeLog.3 in master Paul Eggert
2016-12-08 15:58 ` Eli Zaretskii [this message]
2016-12-08 16:18 ` Paul Eggert
2016-12-08 17:23 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83d1h2ifat.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.