all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* ChangeLog.4
       [not found] <874job5p3n.fsf.ref@yahoo.com>
@ 2023-05-17  8:39 ` Po Lu
  2023-05-17  8:41   ` ChangeLog.4 Po Lu
                     ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Po Lu @ 2023-05-17  8:39 UTC (permalink / raw)
  To: emacs-devel

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?



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  2023-05-17  8:39 ` ChangeLog.4 Po Lu
@ 2023-05-17  8:41   ` Po Lu
  2023-05-17 11:25   ` ChangeLog.4 Eli Zaretskii
  2023-05-18 17:20   ` ChangeLog.4 Sean Whitton
  2 siblings, 0 replies; 8+ messages in thread
From: Po Lu @ 2023-05-17  8:41 UTC (permalink / raw)
  To: emacs-devel

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.



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  2023-05-17  8:39 ` ChangeLog.4 Po Lu
  2023-05-17  8:41   ` ChangeLog.4 Po Lu
@ 2023-05-17 11:25   ` Eli Zaretskii
  2023-05-17 15:39     ` ChangeLog.4 Eli Zaretskii
  2023-05-18 17:20   ` ChangeLog.4 Sean Whitton
  2 siblings, 1 reply; 8+ messages in thread
From: Eli Zaretskii @ 2023-05-17 11:25 UTC (permalink / raw)
  To: Po Lu; +Cc: emacs-devel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  2023-05-17 11:25   ` ChangeLog.4 Eli Zaretskii
@ 2023-05-17 15:39     ` Eli Zaretskii
  0 siblings, 0 replies; 8+ messages in thread
From: Eli Zaretskii @ 2023-05-17 15:39 UTC (permalink / raw)
  To: luangruo; +Cc: emacs-devel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  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-18 17:20   ` Sean Whitton
  2023-05-18 17:44     ` ChangeLog.4 Eli Zaretskii
  2 siblings, 1 reply; 8+ messages in thread
From: Sean Whitton @ 2023-05-18 17:20 UTC (permalink / raw)
  To: Po Lu, emacs-devel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  2023-05-18 17:20   ` ChangeLog.4 Sean Whitton
@ 2023-05-18 17:44     ` Eli Zaretskii
  2023-05-18 17:50       ` ChangeLog.4 Sean Whitton
  0 siblings, 1 reply; 8+ messages in thread
From: Eli Zaretskii @ 2023-05-18 17:44 UTC (permalink / raw)
  To: Sean Whitton; +Cc: luangruo, emacs-devel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  2023-05-18 17:44     ` ChangeLog.4 Eli Zaretskii
@ 2023-05-18 17:50       ` Sean Whitton
  2023-05-18 18:27         ` ChangeLog.4 Eli Zaretskii
  0 siblings, 1 reply; 8+ messages in thread
From: Sean Whitton @ 2023-05-18 17:50 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: luangruo, emacs-devel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: ChangeLog.4
  2023-05-18 17:50       ` ChangeLog.4 Sean Whitton
@ 2023-05-18 18:27         ` Eli Zaretskii
  0 siblings, 0 replies; 8+ messages in thread
From: Eli Zaretskii @ 2023-05-18 18:27 UTC (permalink / raw)
  To: Sean Whitton; +Cc: luangruo, emacs-devel

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



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-05-18 18:27 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [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         ` ChangeLog.4 Eli Zaretskii

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.