Thomas Koenig via Gcc <gcc@gcc.gnu.org> wrote:
I tried to update the coarray_native branch to current master with
"git merge master" as given by
https://gcc.gnu.org/gitwrite.html#branches
That worked without any error message.
Next, I tried to verify that a "git push" would succeed, and
got an error:
$ git gcc-verify
Checking bf6dad60c338a42a7fb85f7b2a5870c0fb2e20f8: FAILED
ERR: ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates should be done
separately from normal commits
This case is not covered by gitwrite.html, what is the best way to
proceed?
FWIW, for 99.99% of my devt I do the same as Andre mentioned in the other
reply (keep patches rebased on top of master).
But i have the c++-coroutine branch which inherits its rules from svn days.
The convention from svn times is for the branch to have a private
ChangeLog.branch file (if it uses one at all).
Thus merges from master should not encounter any case where there’s a
change to a ChangeLog that isn’t from an existing master commit.
====
I keep devel/c++-coroutines up to date with current master thus:
checkout master
fast forward master
checkout devel/c++-coroutines
git merge —edit master
the commit message is editted to read something like
Merge master r11-4499.
* Merge master r11-4499-g323dd4255203.
^ today’s update.
That’s a valid commit message from the PoV of the upstream hooks,
I then test the merged branch...
assuming that succeeds …
git push upstream devel/c++-coroutines.
That set of actions has been working for me for months.
———
This might not solve your immediate issue - (it’s not clear how you’ve
violated the changes mentioned) but it is a sequence of actions that ought
to work going forward (avoiding making changes to those files on the
branch).
probably look at what’s changed in the merge commit and see if you can
revert the offending changes?
Iain
