From: Christopher Lemmer Webber <cwebber@dustycloud.org>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: Changes to the branching workflow
Date: Thu, 04 Mar 2021 16:05:24 -0500 [thread overview]
Message-ID: <874khq8wa3.fsf@dustycloud.org> (raw)
In-Reply-To: <YCWyxGmIo0v6yss+@jasmine.lan>
Hello,
As someone who jumps in and out of Guix development occasionally but who
does have commit access (probably for grantparented-in reasons, heh),
sometimes I don't know where I should commit code or what the current
branching policy is, and I might miss emails like this.
I wonder if we should formalize it. What about adding a section to the
"Contributing" section of the manual explaining what the different
branches are, and when you have a patch that's been approved, when to
push it to which branch?
I think that would help me, and maybe it would help others. Thoughts?
- Chris
Leo Famulari writes:
> Based on experiences with the last "staging" cycle and discussions at
> the most recent Guix Day meeting [0], we've changed the branching
> workflow.
>
> The default branch names remain "core-updates" and "staging".
>
> When we begin actively building and testing the branches, they will be
> renamed to "core-updates-frozen" and "staging-frozen", respectively.
>
> This will indicate that they are closed to any changes except for bug
> fixes and merges of the master branch.
>
> During those periods, new patches can be pushed to "core-updates-next"
> and "staging-next".
>
> Hopefully these changes will clarify the status of the branches and
> reduce confusion.
>
> [0] https://lists.gnu.org/archive/html/guix-devel/2021-02/msg00163.html
next prev parent reply other threads:[~2021-03-04 21:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 22:42 Changes to the branching workflow Leo Famulari
2021-02-12 10:34 ` Tobias Geerinckx-Rice
2021-02-12 18:01 ` Leo Famulari
2021-02-12 19:34 ` Tobias Geerinckx-Rice
2021-02-12 20:17 ` Leo Famulari
2021-02-12 20:49 ` Andreas Enge
2021-02-13 11:24 ` Hartmut Goebel
2021-02-13 18:21 ` Leo Famulari
2021-02-13 19:40 ` Tobias Geerinckx-Rice
2021-02-13 11:19 ` Hartmut Goebel
2021-03-04 21:05 ` Christopher Lemmer Webber [this message]
2021-03-04 22:01 ` zimoun
2021-03-05 15:34 ` Christopher Lemmer Webber
2021-03-05 15:52 ` zimoun
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=874khq8wa3.fsf@dustycloud.org \
--to=cwebber@dustycloud.org \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.