I have created the devel/omp/gcc-15 (aka "OG15") branch, but not yet
populated it with patches carried over from devel/omp/gcc-14. These
development branches are where we put bleeding-edge versions of OpenMP
and OpenACC features.
For previous branches we'd been using ChangeLog.omp files paralleling
the normal ChangeLog files, that were updated manually and committed
with the corresponding patch. In preparing the current patch set,
though, I found that
(a) Many commits -- particularly cherry-picks from mainline -- lacked
corresponding ChangeLog.omp patch hunks.
(b) Many commits had ChangeLog.omp patch hunks that didn't actually
match the corresponding commit.
(c) Hardly any of the ChangeLog.omp patch hunks would apply cleanly,
requiring extra work to resolve conflicts when merging patches from one
branch to the next.
It seems like the easiest solution is just to extend the mechanism used
to manage ChangeLogs automatically on master and release branches, which
is what the attached patch attempts to do. I'm not really familiar with
the infrastructure behind the GCC git repository, though. Is this a bad
idea, or missing something needed to make it work? Since it runs via a
cron job on some machine I can't access, I don't know how to test the
patch without actually applying it and seeing what happens once I push
patches to the branch and the cron job runs. :-S
I think we do not normally have more than one development branch in use
at a time, so next year at this time we would be wanting to replace
devel/omp/gcc-15 with devel/omp/gcc-16 in the list, not have have both
branches in the list.
-Sandra
From 187d823aa916b558e7f2935022619593eb66c005 Mon Sep 17 00:00:00 2001
From: Sandra Loosemore <sloosem...@baylibre.com>
Date: Mon, 12 May 2025 20:24:21 +0000
Subject: [PATCH] Enable automatic ChangeLog updates on devel/omp/gcc-15
branch.
contrib/ChangeLog
* gcc-changelog/git_update_version.py (active_refs): Add
devel/omp/gcc-15.
---
contrib/gcc-changelog/git_update_version.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index aa9adee58fe..6f648eb9660 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -86,7 +86,8 @@ def prepend_to_changelog_files(repo, folder, git_commit, add_to_git):
active_refs = ['master', 'releases/gcc-12',
- 'releases/gcc-13', 'releases/gcc-14', 'releases/gcc-15']
+ 'releases/gcc-13', 'releases/gcc-14', 'releases/gcc-15',
+ 'devel/omp/gcc-15']
parser = argparse.ArgumentParser(description='Update DATESTAMP and generate '
'ChangeLog entries')
--
2.34.1
