From: Eli Zaretskii <eliz@gnu.org>
To: Sean Whitton <spwhitton@spwhitton.name>
Cc: luangruo@yahoo.com, emacs-devel@gnu.org
Subject: Re: ChangeLog.4
Date: Thu, 18 May 2023 21:27:57 +0300 [thread overview]
Message-ID: <83bkihv6j6.fsf@gnu.org> (raw)
In-Reply-To: <87y1lly1ej.fsf@melete.silentflame.com> (message from Sean Whitton on Thu, 18 May 2023 10:50:28 -0700)
> From: Sean Whitton <spwhitton@spwhitton.name>
> Cc: luangruo@yahoo.com, emacs-devel@gnu.org
> Date: Thu, 18 May 2023 10:50:28 -0700
>
> > AUTHORS is not supposed to be merged, see gitmerge.el. AUTHORS is
> > only important when tarring a release or a pretest, and that never
> > happens from master.
>
> Ah sure, but then, how did it end up being the Emacs 29 version on
> master and not some much older version?
Because we don't take any special measures to prevent it from being
merged, so sometimes it does, depending on who does the merge. It's
no big deal. AUTHORS reflects the state of the branch from which it
is regenerated, and that is never master, so even if we merge AUTHORS,
its contents doesn't reflect the contributions in master anyway.
prev parent reply other threads:[~2023-05-18 18:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <874job5p3n.fsf.ref@yahoo.com>
2023-05-17 8:39 ` ChangeLog.4 Po Lu
2023-05-17 8:41 ` ChangeLog.4 Po Lu
2023-05-17 11:25 ` ChangeLog.4 Eli Zaretskii
2023-05-17 15:39 ` ChangeLog.4 Eli Zaretskii
2023-05-18 17:20 ` ChangeLog.4 Sean Whitton
2023-05-18 17:44 ` ChangeLog.4 Eli Zaretskii
2023-05-18 17:50 ` ChangeLog.4 Sean Whitton
2023-05-18 18:27 ` Eli Zaretskii [this message]
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=83bkihv6j6.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=luangruo@yahoo.com \
--cc=spwhitton@spwhitton.name \
/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.