From c1eb13b32676b288a3ab3826501caf7bcd376b7f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 27 Sep 2022 17:49:05 -0700 Subject: [PATCH] Maintaining ChangeLog history: add more details * admin/notes/repo (Maintaining ChangeLog history): Add more details. See . --- admin/notes/repo | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/admin/notes/repo b/admin/notes/repo index f6004a97db1..c2d7f993a02 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. -- 2.39.2