On 5/13/25 02:22, Tobias Burnus wrote:
Hi Sandra, hello world,
Sandra Loosemore wrote:
I have created the devel/omp/gcc-15 (aka "OG15") branch, ...
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
...
corresponding ChangeLog.omp patch hunks.
...
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.
It seems to me as if your approach causes merge issues. Namely, as
git_update_version.py updates DATESTAMP and ChangeLog, there is a
clash with the updates to the same files on the GCC 15 branch, when
merging.
Additionally, I am not really sure that nightly bumps, updating usually
only the DATESTAMP, are really useful.
How about the attached patch? With it, running
./contrib/gcc-changelog/git_update_version.py \
--suffix '.omp' -c \
--exclude-branch=origin/releases/gcc-15 \
--last-commit=0b76b58a5875d519f95a5af661fb64e42a42ed8e
works where --last-commit could be, e.g.,
git log -1 --pretty=format:%H --grep "ChangeLog.omp Bump"
This could be wrapped in some script to (e.g. committed to this
the branch of interest) to handle the arguments and, possibly,
commit - with the possibility to skip commits if only
DATESTAMP<suffix> has changed.
This could then be run manually - or as someone's cronjob.
* * *
What do you - and anyone else - think about this approach?
Or about the original one? Or has yet another good alternative
or additional idea?
My main concern is, how do you test any of this stuff without risking
trashing the branch, or the repository? I still struggle with even
basic git usage and I'm not very fluent with Python either, so I'm
personally very wary of attempting anything other than the simplest
tweaks to the script that is there already.
Originally, though, I'd been thinking that we could retain the separate
ChangeLog.omp files for this branch and just generate them
automatically, which would address the concern about merges.
That could be implemented by adding some hard-wired mapping of branches
-> changelog file suffixes to the script. But that's more than I felt
comfortable trying to implement blindly.
-Sandra
