emacs-devel
[Top][All Lists]
Advanced

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

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


From: Robert Pluim
Subject: Re: master e714b31 3/6: Merge from origin/emacs-28
Date: Wed, 10 Nov 2021 18:18:14 +0100

>>>>> On Wed, 10 Nov 2021 19:12:20 +0200, Eli Zaretskii <eliz@gnu.org> said:

    >> From: Robert Pluim <rpluim@gmail.com>
    >> Cc: Eli Zaretskii <eliz@gnu.org>
    >> Date: Wed, 10 Nov 2021 16:55:40 +0100
    >> 
    Eli> +++
    Eli> -*** 'slot-value' can now be used to read slots of 'cl-defstruct' 
objects
    >> 
    >> This line was a merge error, which Iʼve fixed. There may be more
    >> lurking.

    Eli> Sorry about that.

Merging NEWS is easy to get wrong, especially with the '+++' '---'
markers (I got it wrong when fixing the merge, and was about to blame
Stefan for not documenting his changes 😼).

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

Robert
-- 



reply via email to

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