Re: master e714b31 3/6: Merge from origin/emacs-28

[Eli Zaretskii]

> From: Juri Linkov <juri@linkov.net>
> Date: Wed, 10 Nov 2021 20:37:09 +0200
> Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
> 
> >>     >> I vote +1 on the suggestion to just start using etc/NEWS.29
> >>
> >>     Eli> I think I found the reason why merging NEWS didn't work for me, 
> >> so it
> >>     Eli> won't happen again.  There was sufficient resistance to using a
> >>     Eli> versioned name, so we should stick to what we have as long as it 
> >> works
> >>     Eli> well enough.
> >>
> >> OK.
> >
> > Unfortunately, this is not quite OK.  I had to scrape the remains of NEWS.28
> > out of the NEWS in master.  Thanks for the reference to the commit e714b31,
> > this helped a lot.
> 
> Actually, this is not the full story.  I had also to re-add changes
> omitted in the merge from NEWS in emacs-28 to NEWS-28.

I'm sorry for the trouble, but we all sometimes need to clean up after
someone else in the repository.  I do that almost every day.  So I
hope I can be forgiven for this single incident, just this once.