From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx-relay90-hz1.antispameurope.com (mx-relay90-hz1.antispameurope.com [94.100.133.90]) by sourceware.org (Postfix) with ESMTPS id E350E385802A for ; Sat, 16 Jan 2021 13:00:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E350E385802A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=net-b.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=prvs=06438a53cd=burnus@net-b.de Received: from s041.wsp.plusnet.de ([195.90.7.81]) by mx-relay90-hz1.antispameurope.com; Sat, 16 Jan 2021 14:00:53 +0100 Received: from [192.168.0.28] (port-92-195-246-48.dynamic.as20676.net [92.195.246.48]) by s041.wsp.plusnet.de (Postfix) with ESMTPSA id 799C12C0350; Sat, 16 Jan 2021 14:00:34 +0100 (CET) Subject: Re: Question on push To: Jerry DeLisle , fortran@gcc.gnu.org References: From: Tobias Burnus Message-ID: Date: Sat, 16 Jan 2021 14:00:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-cloud-security-sender: burnus@net-b.de X-cloud-security-recipient: fortran@gcc.gnu.org X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay90-hz1.antispameurope.com with E353B1A40015 X-cloud-security-connect: s041.wsp.plusnet.de[195.90.7.81], TLS=1, IP=195.90.7.81 X-cloud-security-Digest: cd727348e718d3c9aa4b99c97d71a0c2 X-cloud-security: scantime:17.69 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 13:00:57 -0000 Hi Jerry, yes, ChangeLog files are automatically generated from the commit log by the contrib/gcc-changelog/. If the generated changelog file is wrong because the script mishandled something, that script should be fixed. In any case, if the ChangeLog file is wrong, you have to wait until the nightly script has run (which also bumps the gcc/DATESTAMP) and then you can fix the ChangeLog files and commit them. Tobias PS: Your commit also missed the PR in the commit. PPS: If you backport something, use 'git cherry-pick -x', which also will handle the backported information in the changelog. On 15.01.21 23:36, Jerry DeLisle wrote: > Naturally the push was rejected several times.  As I was trying to > interpret the reasons given and go back and read the instructions, I > was given the impression that the behind the scenes process would > ammend the actual ChangeLog files for you.  I have not seen this > happen so to clarify, There are two ChangeLog files involved. > gcc/testsuite/ChangeLog and libgfortran/ChangeLog.