From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78A30138334 for ; Mon, 4 Feb 2019 19:04:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48631E09DA; Mon, 4 Feb 2019 19:04:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1099DE09C9 for ; Mon, 4 Feb 2019 19:04:03 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 3F3B933D3C5; Mon, 4 Feb 2019 19:04:01 +0000 (UTC) Message-ID: <1549307037.893.50.camel@gentoo.org> Subject: Re: [gentoo-project] [RFC] GURU v2, now with reviewed layer From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-project@lists.gentoo.org Date: Mon, 04 Feb 2019 20:03:57 +0100 In-Reply-To: References: <1549301931.893.35.camel@gentoo.org> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-ALDOnnDq7JjYzpydYU79" X-Mailer: Evolution 3.26.6 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Project discussion list X-BeenThere: gentoo-project@lists.gentoo.org Reply-To: gentoo-project@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply Mime-Version: 1.0 X-Archives-Salt: 3d62856c-6d69-4d48-afba-40f020c3ec12 X-Archives-Hash: 2e013a6682982cab40f5732d024b1a04 --=-ALDOnnDq7JjYzpydYU79 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2019-02-04 at 14:00 -0500, Alec Warner wrote: > On Mon, Feb 4, 2019 at 12:39 PM Micha=C5=82 G=C3=B3rny wrote: >=20 > > Hello, > >=20 > > 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 mor= e > > like Sunrise but with some automation in mind. > >=20 > > 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. > >=20 >=20 > I'm looking for more information on the private branch. What is it a bran= ch > of? >=20 > Like what I might expect is: >=20 > repo - master # this is the public branch users use > repo - These are the in-progress = or > stale PRs. >=20 > When review is complete, repo - somebranch is merged into repo - master. >=20 > Is this what you are proposing? >=20 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. --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-ALDOnnDq7JjYzpydYU79 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEXr8g+Zb7PCLMb8pAur8dX/jIEQoFAlxYjJ1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDVF QkYyMEY5OTZGQjNDMjJDQzZGQ0E0MEJBQkYxRDVGRjhDODExMEEACgkQur8dX/jI EQpOPhAAlZovOIHBqWabnE9glZlsIY/9QAdWv0q4Ro7weIPUSYrJKCGCXhdTwOXO ijU6nRKSybmmrIs9fnrfDWdeFytVj8w88GFuH78vKKXU9onfoqTRrf0ATh/cviG4 Tff2lKkBb6qZJCeOebz3O2jy4Bl2cpi95g1XAKo6I2iwS59FIiYH5mtowDJAMItB 4oAKDPSBO+QMsCE5527AySrGtClr7CbB7FX+OeIjqj6R8VWS/aINPtVdVGwEwTL2 pgz8pKT500yZ7EyEUWHbC1lXoaUn09N9n6a1Wc5a9IHO0oqfmIbrVIQ1BsBVFj/q UNmocODXV1V2BfIrq5GgChulT68ptOUnXc1MZd8UosDX/fH/SXgm1pUjDhNG7fnf O2yoLtNxCXS9G/8Gszsuwb70tCC+GQYU3pa58Hzoymxaxxr+hsQ43uief8v/w1Ri tnHFOGBU7O6m8/RDLiVT8FyQ8Ai5dZHUhmk4kKJfrUaU2msHUBl1AKK24rKLVg3c uppx5HMj3TaRvMtspd+Rd6qxVqM0L5vxhdEReA6DvZ6KzE8sqA/CYLM3WPIiEok1 BWN/+YzQR34a43ul3++u6nLgZ21+Ea/YlpyYaIv0O034qsk7WTW1JpYGXpMrWBba Ab9CSP5HaALm5uufKIgDBzmNaT5FxcEbhziGLaio4eZv3PwWsh8= =2rZI -----END PGP SIGNATURE----- --=-ALDOnnDq7JjYzpydYU79--