Am 26.05.20 um 00:48 schrieb Jakub Jelinek via Gcc:
I've turned the strict mode of Martin Liška's hook changes,
This means that it is no longer possible to do a git gcc-backport
followed by a git push. If there is a procedure for this, it
is not documented on https://gcc.gnu.org/gitwrite.html .
Please document this, or (even more preferred) automate the process
so that git gcc-backport does not touch the ChangeLog files.
Regards
Thomas
$ git gcc-backport r11-588-g8df7ee67f6fdc780e9453f2baa8d1bf62c000761
automatischer Merge von libgomp/ChangeLog
automatischer Merge von libgfortran/ChangeLog
automatischer Merge von gcc/fortran/ChangeLog
[releases/gcc-10 bb55bfe5871] Fixes a hang on an invalid ID in a WAIT
statement.
Date: Sat May 23 19:01:43 2020 +0200
7 files changed, 50 insertions(+)
create mode 100644 libgomp/testsuite/libgomp.fortran/async_io_9.f90
$ git push
perl: warning: Setting locale failed.
perl: warning: Please check that your locale settings:
LANGUAGE = (unset),
LC_ALL = (unset),
LANG = "de_DE.UTF-8"
are supported and installed on your system.
perl: warning: Falling back to the standard locale ("C").
Objekte aufzählen: 31, Fertig.
Zähle Objekte: 100% (31/31), Fertig.
Delta-Kompression verwendet bis zu 16 Threads.
Komprimiere Objekte: 100% (17/17), Fertig.
Schreibe Objekte: 100% (17/17), 3.93 KiB | 3.93 MiB/s, Fertig.
Gesamt 17 (Delta 14), Wiederverwendet 0 (Delta 0), Pack wiederverwendet 0
remote: *** ChangeLog format failed:
remote: ERR: ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates should
be done separately from normal commits
remote:
remote: Please see: https://gcc.gnu.org/codingconventions.html#ChangeLogs
remote:
remote: error: hook declined to update refs/heads/releases/gcc-10
To git+ssh://gcc.gnu.org/git/gcc.git
! [remote rejected] releases/gcc-10 -> releases/gcc-10 (hook
declined)
error: Fehler beim Versenden einiger Referenzen nach
'git+ssh://tkoe...@gcc.gnu.org/git/gcc.git'
which means that from now on no commits to the trunk or release branches
should be changing any ChangeLog files together with the other files,
ChangeLog entry should be solely in the commit message.
The DATESTAMP bumping script will be updating the ChangeLog files for you.
If somebody makes a mistake in that, please wait 24 hours (at least until
after 00:16 UTC after your commit) so that the script will create the
ChangeLog entries, and afterwards it can be fixed by adjusting the ChangeLog
files. But you can only touch the ChangeLog files in that case (and
shouldn't write a ChangeLog entry for that in the commit message).
If anything goes wrong, please let me, other RMs and Martin Liška know.
Jakub
