From: zimoun <zimon.toutoune@gmail.com>
To: Christopher Lemmer Webber <cwebber@dustycloud.org>
Cc: guix-devel@gnu.org
Subject: Re: Changes to the branching workflow
Date: Fri, 05 Mar 2021 16:52:55 +0100 [thread overview]
Message-ID: <86wnulsilk.fsf@gmail.com> (raw)
In-Reply-To: <87sg5962de.fsf@dustycloud.org>
Hi Chris,
On Fri, 05 Mar 2021 at 10:34, Christopher Lemmer Webber <cwebber@dustycloud.org> wrote:
> zimoun writes:
>> On Thu, 04 Mar 2021 at 16:05, Christopher Lemmer Webber <cwebber@dustycloud.org> wrote:
>>
>>> 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?
>>
>> Do you mean something like #8 in [1] and then [2]?
>>
>> 1: <https://guix.gnu.org/manual/en/guix.html#Submitting-Patches>
>> 2: <https://guix.gnu.org/manual/en/guix.html#Commit-Access>
>>
>> In [2], it reads:
>>
>> For patches that just add a new package, and a simple one, it’s
>> OK to commit, if you’re confident (which means you successfully
>> built it in a chroot setup, and have done a reasonable copyright
>> and license auditing). Likewise for package upgrades, except
>> upgrades that trigger a lot of rebuilds (for example, upgrading
>> GnuTLS or GLib).
>>
>> which I understand as: the ’staging’ or ’core-update’ patches should go
>> to guix-patches and not be pushed directly. Especially when one has
>> commit access and does not follow closely enough to know the status of
>> the very branch.
>
> I don't think the quoted part fully answered it, but the following part
> does answer it:
Point #8 in [1] answered to «explaining what the different branches».
And because it was hard to refer a specific part of [2], hence the
quote, to answer to: «when you have a patch that's been approved, when to
push it to which branch?», especially to know the status of the branch.
Sorry if I have been unclear.
Cheers,
simon
prev parent reply other threads:[~2021-03-05 15:59 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
2021-03-04 22:01 ` zimoun
2021-03-05 15:34 ` Christopher Lemmer Webber
2021-03-05 15:52 ` zimoun [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
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=86wnulsilk.fsf@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=cwebber@dustycloud.org \
--cc=guix-devel@gnu.org \
/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).