public inbox for gentoo-project@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-project@lists.gentoo.org
Subject: Re: [gentoo-project] [RFC] GURU v2, now with reviewed layer
Date: Mon, 04 Feb 2019 20:03:57 +0100	[thread overview]
Message-ID: <1549307037.893.50.camel@gentoo.org> (raw)
In-Reply-To: <CAAr7Pr9+9SGGnY1Yf5mR8_7rF5wVn0F+u667E_w3pY+oH+kZiw@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1525 bytes --]

On Mon, 2019-02-04 at 14:00 -0500, Alec Warner wrote:
> On Mon, Feb 4, 2019 at 12:39 PM Michał Górny <mgorny@gentoo.org> wrote:
> 
> > Hello,
> > 
> > After some initial discussion on the GURU user repository, I'd like to
> > start bike... I mean, brainstorming v2 of the idea.  This time it's more
> > like Sunrise but with some automation in mind.
> > 
> > Let's go with two layers like Sunrise -- one private working branch,
> > and another public that's exposed to users.  Commits are merged from
> > private to public after some kind of review.  I suppose to avoid
> > depgraph misshots etc. we'd want to move commits incrementally, i.e.
> > public is only doing fast-forward merges from dev.
> > 
> 
> I'm looking for more information on the private branch. What is it a branch
> of?
> 
> Like what I might expect is:
> 
> repo - master # this is the public branch users use
> repo - <literally thousands of other branches> These are the in-progress or
> stale PRs.
> 
> When review is complete, repo - somebranch is merged into repo - master.
> 
> Is this what you are proposing?
> 

No.  As I said, I'm proposing a Sunrise-layout layout.

dev -- branch which contributors use to work on their ebuilds.

reviewed -- branch which users use.

When commits are reviewed, fast-forward merges are done from dev
to reviewed.

Attempting to automatically merge multiple independent branches will
inevitably result in unpredictable final state.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

  reply	other threads:[~2019-02-04 19:04 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-04 17:38 [gentoo-project] [RFC] GURU v2, now with reviewed layer Michał Górny
2019-02-04 17:45 ` Kristian Fiskerstrand
2019-02-04 17:47 ` Michał Górny
2019-02-04 18:14 ` Joonas Niilola
2019-02-04 18:38   ` Rich Freeman
2019-02-04 18:47   ` Michał Górny
2019-02-04 19:00 ` Alec Warner
2019-02-04 19:03   ` Michał Górny [this message]
2019-02-04 19:52     ` Alec Warner
2019-02-04 20:09       ` Michał Górny
2019-02-05 16:41 ` Andrew Savchenko
2019-02-05 18:06   ` Ian Stakenvicius
2019-02-05 21:43     ` Andrew Savchenko

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=1549307037.893.50.camel@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-project@lists.gentoo.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox