On Wed, Oct 28, 2020 at 06:53:35PM +0100, Thomas Koenig via Gcc 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?
Don't use git gcc-verify for development branches or user branches,
it checks the rules required for release branches and the trunk only.
Other branches have different rules.
Jakub
