From: Mark H Weaver <mhw@netris.org>
To: Christopher Baines <mail@cbaines.net>, guix-devel@gnu.org
Subject: Re: Cleaning up branches on savannah
Date: Fri, 07 Jun 2024 09:43:00 -0400 [thread overview]
Message-ID: <87o78c98cg.fsf@netris.org> (raw)
In-Reply-To: <871q592ixj.fsf@cbaines.net>
Christopher Baines <mail@cbaines.net> writes:
> There are quite a few branches on savannah, and it would be nice to
> remove them if they're unnecessary, at least because that will prompt
> the QA data service to delete the data, saving on disk space.
[...]
> The following branches all seem to have commits that haven't made it to
> master yet, although I haven't checked if the changes were applied but
> just with different commit ids.
>
> - gnuzilla-updates
The changes to 'gnuzilla-updates' were applied to 'master' but with
different commit ids.
In general, whenever there's an update to IceCat, which typically
happens about once per month, I delete the 'gnuzilla-updates' branch and
then immediately push a new one that is current 'master' plus the
untested commit(s) for the IceCat update. This triggers the
'gnuzilla-updates' jobset on ci.guix.gnu.org to build the new IceCat.
Later, when I'm satisfied that the new IceCat works, I push the update
to 'master' as separate commits. Usually, the new commit(s) on 'master'
are precisely the same as the ones on the 'gnuzilla-updates' branch
except for the commit log message.
If there's a better way to do this that does not entail much more work
for me, please let me know.
Thanks,
Mark
next prev parent reply other threads:[~2024-06-07 13:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-07 9:36 Cleaning up branches on savannah Christopher Baines
2024-06-07 12:46 ` Lars-Dominik Braun
2024-06-07 13:43 ` Mark H Weaver [this message]
2024-06-07 14:00 ` Christopher Baines
2024-06-11 15:16 ` Mark H Weaver
2024-06-12 9:11 ` Andreas Enge
2024-06-19 14:00 ` Christopher Baines
2024-06-19 14:03 ` Christopher Baines
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o78c98cg.fsf@netris.org \
--to=mhw@netris.org \
--cc=guix-devel@gnu.org \
--cc=mail@cbaines.net \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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).