emacs-diffs
[Top][All Lists]
Advanced

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

master c1eb13b326: Maintaining ChangeLog history: add more details


From: Sean Whitton
Subject: master c1eb13b326: Maintaining ChangeLog history: add more details
Date: Tue, 27 Sep 2022 20:49:25 -0400 (EDT)

branch: master
commit c1eb13b32676b288a3ab3826501caf7bcd376b7f
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>

    Maintaining ChangeLog history: add more details
    
    * admin/notes/repo (Maintaining ChangeLog history): Add more details.
    See <https://debbugs.gnu.org/58092#37>.
---
 admin/notes/repo | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/admin/notes/repo b/admin/notes/repo
index f6004a97db..c2d7f993a0 100644
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -124,6 +124,11 @@ This ChangeLog file is not put into the repository.
 'make change-history' copies all newer ChangeLog entries into the
 start of the newest ChangeLog history file.  These ChangeLog entries
 are thereafter considered to be old, so later uses of 'make ChangeLog'
-and/or 'make change-history' will no longer copy the entries.  To
-alter ChangeLog history, run 'make change-history', then edit
-the ChangeLog history files manually and commit your changes.
+and/or 'make change-history' will no longer copy the entries.
+
+To alter ChangeLog history, run 'make change-history' and commit the
+changes made by that command.  Then edit the ChangeLog history files
+manually and commit those changes in a second, distinct commit.
+Altering ChangeLog history like this can make things harder for those
+who handle merging branches and Emacs releases, so reserve it for
+correcting more serious mistakes.



reply via email to

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