From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 7B3B33858D20 for ; Thu, 10 Nov 2022 14:01:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7B3B33858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 197811FD13; Thu, 10 Nov 2022 14:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1668088865; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=urVUMZE407jkogRKcycW3QG5EToch/f/LYzvgDH5yYc=; b=OvQXVcRlUgQC5HfTIUm4ZMJUkxV1fgAnAmCR1cdsa7uFeGc6RqfzZ2F/tfZgqjBERiJoaK bKY/GcBsQpp9sYyBto/aSAJ4W8/Cq9g4bDX+UVvfYaMayTKun6WJJE15jIrr48vYXUIs5i g4LHTwUL+LD5bQCfAJyQttbvm4BEFeM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1668088865; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=urVUMZE407jkogRKcycW3QG5EToch/f/LYzvgDH5yYc=; b=9TTQ/2FHXfhaU2Qv3MgBH8fJETzx4dY/eUjGmUfYF8RwlnjGlb75Cr0yecFggPQAup/eb4 E8DZew7UX4dM5/BQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 03BCC1332F; Thu, 10 Nov 2022 14:01:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 83eROyAEbWOgEQAAMHmgww (envelope-from ); Thu, 10 Nov 2022 14:01:04 +0000 Message-ID: <4f0559c9-9c36-cd73-6af6-64a87bb15248@suse.cz> Date: Thu, 10 Nov 2022 15:01:04 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [committed] Add another commit to ignore Content-Language: en-US To: Jakub Jelinek , gcc-patches@gcc.gnu.org Cc: Thomas Schwinge References: From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_LOTSOFHASH,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 11/7/22 09:25, Jakub Jelinek wrote: > Hi! > > We can't handle r13-3652-ge4cba49413ca429dc82f6aa2e88129ecb3fdd943 > because that commit removed whole liboffloadmic including its > ChangeLog (I'm surprised that touching ChangeLog worked out together > with removing the files), but gcc-changelog/git_update_version.py > then choked on it because it couldn't add the liboffloadmic > entries. Hi. Interesting. I'll handle such a situation for the future. > Wonder if next time such removals shouldn't be committed in 2 steps, > in one step everything but the ChangeLog would be removed, wait for > update_git_version and then in a separate commit just remove the > ChangeLog. Will take a look. Martin > > Anyway, to restore daily bumps I had to commit the following > patch, run update_git_version manually and then commit in > r13-3705-g89d0a14a1fdf89d38d9db1156ffde8c1b276823c the ChangeLog > entries for the removal manually. > > 2022-11-06 Jakub Jelinek > > * gcc-changelog/git_update_version.py: Add > e4cba49413ca429dc82f6aa2e88129ecb3fdd943 to ignored commits. > > --- contrib/gcc-changelog/git_update_version.py.jj > +++ contrib/gcc-changelog/git_update_version.py > @@ -33,7 +33,8 @@ IGNORED_COMMITS = ( > '04a040d907a83af54e0a98bdba5bfabc0ef4f700', > '2e96b5f14e4025691b57d2301d71aa6092ed44bc', > '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4', > - '86d8e0c0652ef5236a460b75c25e4f7093cc0651') > + '86d8e0c0652ef5236a460b75c25e4f7093cc0651', > + 'e4cba49413ca429dc82f6aa2e88129ecb3fdd943') > > FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' > logging.basicConfig(level=logging.INFO, format=FORMAT, > > > Jakub >