public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: "Martin Liška" <mliska@suse.cz>
To: Jakub Jelinek <jakub@redhat.com>, gcc-patches@gcc.gnu.org
Cc: Thomas Schwinge <thomas@codesourcery.com>
Subject: Re: [committed] Add another commit to ignore
Date: Thu, 10 Nov 2022 15:01:04 +0100	[thread overview]
Message-ID: <4f0559c9-9c36-cd73-6af6-64a87bb15248@suse.cz> (raw)
In-Reply-To: <Y2jA5jLpvM8e2Cfu@tucnak>

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  <jakub@redhat.com>
> 
>          * 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
> 


      reply	other threads:[~2022-11-10 14:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-07  8:25 Jakub Jelinek
2022-11-10 14:01 ` Martin Liška [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4f0559c9-9c36-cd73-6af6-64a87bb15248@suse.cz \
    --to=mliska@suse.cz \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=jakub@redhat.com \
    --cc=thomas@codesourcery.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).