ChangeLog.4

ChangeLog.4

[Po Lu]

Every change after:

2022-04-04  Eli Zaretskii  <eliz@gnu.org>

	* Version 28.1 released.

appears to have been made on:

2023-04-15  Eli Zaretskii  <eliz@gnu.org>
2023-04-15  Po Lu  <luangruo@yahoo.com>

in ChangeLog.4.  Would someone please look into this?

Re: ChangeLog.4

[Po Lu]

Po Lu <luangruo@yahoo.com> writes:

> in ChangeLog.4.  Would someone please look into this?

To be specific, the versions on the master branch, hopefully not the
ones in the pretest tarballs.

Re: ChangeLog.4

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Date: Wed, 17 May 2023 16:39:08 +0800
> 
> Every change after:
> 
> 2022-04-04  Eli Zaretskii  <eliz@gnu.org>
> 
> 	* Version 28.1 released.
> 
> appears to have been made on:
> 
> 2023-04-15  Eli Zaretskii  <eliz@gnu.org>
> 2023-04-15  Po Lu  <luangruo@yahoo.com>
> 
> in ChangeLog.4.  Would someone please look into this?

Some kind of gitmerge snafu, it seems.

I fixed that by copying the correct version from the release branch
over the corrupted one.

Re: ChangeLog.4

[Eli Zaretskii]

> Date: Wed, 17 May 2023 14:25:17 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> > From: Po Lu <luangruo@yahoo.com>
> > Date: Wed, 17 May 2023 16:39:08 +0800
> > 
> > Every change after:
> > 
> > 2022-04-04  Eli Zaretskii  <eliz@gnu.org>
> > 
> > 	* Version 28.1 released.
> > 
> > appears to have been made on:
> > 
> > 2023-04-15  Eli Zaretskii  <eliz@gnu.org>
> > 2023-04-15  Po Lu  <luangruo@yahoo.com>
> > 
> > in ChangeLog.4.  Would someone please look into this?
> 
> Some kind of gitmerge snafu, it seems.

I figured out the reason: it's my fault.  I have in my ~/.gitconfig

  [merge "merge-changelog"]
      name = GNU-style ChangeLog merge driver
      driver = /usr/local/bin/git-merge-changelog %O %A %B

So this is the result of using git-merge-changelog, which is not TRT
when merging ChangeLog.4 from the release branch to master.

Sorry.

Re: ChangeLog.4

[Sean Whitton]

Hello,

On Wed 17 May 2023 at 04:39PM +08, Po Lu wrote:

> Every change after:
>
> 2022-04-04  Eli Zaretskii  <eliz@gnu.org>
>
> 	* Version 28.1 released.
>
> appears to have been made on:
>
> 2023-04-15  Eli Zaretskii  <eliz@gnu.org>
> 2023-04-15  Po Lu  <luangruo@yahoo.com>
>
> in ChangeLog.4.  Would someone please look into this?

Looks like AUTHORS on master is somehow still the Emacs 28 version, too.

-- 
Sean Whitton

Re: ChangeLog.4

[Eli Zaretskii]

> From: Sean Whitton <spwhitton@spwhitton.name>
> Date: Thu, 18 May 2023 10:20:14 -0700
> 
> Looks like AUTHORS on master is somehow still the Emacs 28 version, too.

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.

Re: ChangeLog.4

[Sean Whitton]

Hello,

On Thu 18 May 2023 at 08:44PM +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@spwhitton.name>
>> Date: Thu, 18 May 2023 10:20:14 -0700
>>
>> Looks like AUTHORS on master is somehow still the Emacs 28 version, too.
>
> 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?

-- 
Sean Whitton

Re: ChangeLog.4

[Eli Zaretskii]

> 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.