From: Leo Famulari <leo@famulari.name>
To: Hartmut Goebel <h.goebel@crazy-compilers.com>
Cc: guix-devel@gnu.org
Subject: Re: Changes to the branching workflow
Date: Sat, 13 Feb 2021 13:21:16 -0500 [thread overview]
Message-ID: <YCgYnIHzCa5MqxD1@jasmine.lan> (raw)
In-Reply-To: <e5b0d89b-0d02-3870-ba46-96e8d9346a1c@crazy-compilers.com>
On Sat, Feb 13, 2021 at 12:24:50PM +0100, Hartmut Goebel wrote:
> Am 12.02.21 um 21:49 schrieb Andreas Enge:
> > From what I understood of the discussion, I would also go with Tobias's and
> > Efraim's suggestion: There is a core-updates branch that is constantly open
> > and where people can push; this does not seem to leave a possibility of
> > mistake, almost by definition. Then we can branch off core-updates-frozen,
> > which is frozen :), except for cherry-picked bug fixing commits and merges
> > from master. Once it is finished, it is merged into master and deleted.
>
> This is what I understood, too.
>
> > Technically speaking, this is the same as your suggestion, Leo, but it
> > avoids the constant dance between core-updates, that disappears and
> > reappears under the name core-updates-next, that disappears and reappears
> > under the name core-updates, and so on.
> It's even worse: When removing staging and core-updates at Savannah, this
> does not effect local copies. Thus one might push these branches to
> Savannah, which might lead to a lot of confusion and trouble.
Alright.
Due to overwhelming demand both on and off list, the bikeshed has been
repainted.
next prev parent reply other threads:[~2021-02-13 18:21 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 [this message]
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
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=YCgYnIHzCa5MqxD1@jasmine.lan \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
--cc=h.goebel@crazy-compilers.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.
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).