[Top][All Lists]

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

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

From: Juri Linkov
Subject: Re: master e714b31 3/6: Merge from origin/emacs-28
Date: Wed, 10 Nov 2021 21:06:20 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu)

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

No problem for me.  But such incidents show why this complicated merging
looks scary, so I still hesitate to merge from emacs-28 myself :-)

reply via email to

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