[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: emacs-29 e2ac0d416b9 1/5: ; Merge from origin/emacs-28

From: Stefan Kangas
Subject: Re: emacs-29 e2ac0d416b9 1/5: ; Merge from origin/emacs-28
Date: Mon, 20 Feb 2023 08:50:10 -0800

Eli Zaretskii <eliz@gnu.org> writes:

>>     git diff 068b53500e24b7b..ad6c6a3a11569c4
> Why would we need to eyeball all those changes now?  It's a wasted
> effort.  We never merge to the release branch, never.

I already eyeballed all of those changes, so there's no need for you to
do it too.  Here's a summary of the changes:

$ git diff -b --stat 068b53500e24b7b..ad6c6a3a11569c4
 ChangeLog.3 | 430 +++++++++++++++++++++++++++++++++++++-
 etc/AUTHORS |  24 +--
 etc/HISTORY |   2 +
 3 files changed, 443 insertions(+), 13 deletions(-)

> You will recreate those as part of tarring Emacs 29 anyway, so why
> merge them?

You left out the part of my message where I explained this, but a merge
preserves history and tags.  That's generally why you merge instead of
simply copying files.  It also happens to be more convenient.

> It is simply unnecessary risk, and something we never do, for very
> good reasons.  I'd sleep better if you'd reverted those changes on
> emacs-29, and made the single change in HISTORY by hand.

The risk is minimal, since we're only changing documentation files and
not code.  There is also a big gain in simplicity.  These are standard
git operations, after all.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]