On 24.05.21 09:45, Gerald Pfeifer wrote:
On Sun, 23 May 2021, Tobias Burnus wrote:
As there was some confusion regarding when the ChangeLog is generated,
I propose the attached wwwdocs patch. Comments?
-<li>Apply the patch to your local tree. ChangeLog entries will be
-automatically added to the corresponding ChangeLog files based
-on the git commit message. See the documentation of
+<li>Apply the patch to your local tree. On the release branches, ChangeLog
+entries will be automatically added to the corresponding ChangeLog files based
+on the git commit message by the daily-bump commit.
Just "On release branches".
And "by the daily-dump commit based on git commit messages" (plural
for commit messages and different order).
Can we assume everyone knows about the "daily-dump commit" here, or
should we just write "once a day" or something like that?
I think "once a day" is clearer. [The commit has the message "Daily
bump." and bumps (not "dumps") the date in DATESTAMP. I wanted to relate
those – but it seems as if this just adds more confusion.]
And a question for my understanding: Why only on release branches?
From what I can tell the same applies for trunk?
Yes, to mainline ("master" branch, also available as "trunk") and to
(currently) 9, 10, and 11 – but not to closed (release) branches like
GCC 8 (releases/gcc-8) or to devel/*, vendor/*, user/* branches.
In my mind, "release branch" included the to-be-released mainline (in
line with the version list on gcc.gnu.org), but one can argue about
"branch" and "release". – I now use "master" (as that's the branch name
in our git repo, and not "target" (alias) or "mainline" (generic GCC term)).
Hence, I attached a new version ...
Tobias
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 München
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Frank
Thürauf
htdocs/gitwrite.html: Clarify ChangeLog generation
diff --git a/htdocs/gitwrite.html b/htdocs/gitwrite.html
index 8363e70c..596f3bef 100644
--- a/htdocs/gitwrite.html
+++ b/htdocs/gitwrite.html
@@ -233,9 +233,9 @@ pull</code>" before attempting a checkin; this will save you a little
time if someone else has modified the source tree since the last time
you synced your sources.</li>
-<li>Apply the patch to your local tree. ChangeLog entries will be
-automatically added to the corresponding ChangeLog files based
-on the git commit message. See the documentation of
+<li>Apply the patch to your local tree. On master and release branches,
+ChangeLog entries will be automatically added to the corresponding ChangeLog
+files based on the git commit message once a day. See the documentation of
<a href="codingconventions.html#ChangeLogs">ChangeLog format</a>.</li>
<li>Make sure to rebuild any generated files affected by
