From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UEIFImdRJmDAFQAA0tVLHw (envelope-from ) for ; Fri, 12 Feb 2021 09:59:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eM7NHWdRJmBpOAAAB5/wlQ (envelope-from ) for ; Fri, 12 Feb 2021 09:59:03 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2C87D9402B3 for ; Fri, 12 Feb 2021 09:59:02 +0000 (UTC) Received: from localhost ([::1]:50404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAVE5-0007GX-JQ for larch@yhetil.org; Fri, 12 Feb 2021 04:59:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAVDl-0007GQ-DY for guix-devel@gnu.org; Fri, 12 Feb 2021 04:58:41 -0500 Received: from flashner.co.il ([178.62.234.194]:33786) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAVDj-0003hj-Uc; Fri, 12 Feb 2021 04:58:41 -0500 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id B685F40031; Fri, 12 Feb 2021 09:58:06 +0000 (UTC) Date: Fri, 12 Feb 2021 11:57:34 +0200 From: Efraim Flashner To: Leo Famulari Subject: Re: branch naming conventions [was Re: Guix Day: Notes from the CI session] Message-ID: References: <87ft26xzci.fsf@inria.fr> <87r1ln386n.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mKk58lklzog0mm7o" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.96 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: 2C87D9402B3 X-Spam-Score: -3.96 X-Migadu-Scanner: scn1.migadu.com X-TUID: c8wl2vf7VDVD --mKk58lklzog0mm7o Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 11, 2021 at 04:14:24PM -0500, Leo Famulari wrote: > On Wed, Feb 10, 2021 at 10:49:04PM +0100, Ludovic Court=C3=A8s wrote: > > Leo Famulari skribis: > >=20 > > > On Wed, Feb 10, 2021 at 04:09:15PM +0200, Efraim Flashner wrote: > > >> My concern about that is that it basically swaps what we have now. U= sing > > >> -frozen makes it a bit clearer that we're building it out. > > > > > > Good idea, I like it. > >=20 > > +1 > >=20 > > Would someone be willing to add a couple of lines about this in the > > manual, next to the place where branching is mentioned? >=20 > Done in commit 175bea0ca42dba3e02109820efae0cac2804e73b I don't think we still need to create the -next branch, staging and staging-frozen seem like they should be enough. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --mKk58lklzog0mm7o Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmAmUQsACgkQQarn3Mo9 g1FbzBAAm55TSAgoZFoJCE8eSndOQRH9JmfFbYOLPOo04qnlJ/CuyabKDIoaUn8o q7HBYviPihvPLq4nd+xM7KKDG4UrFeSJMOtJq//2nWlWxPokDPNCzWhkC9+/2JyF pr7qNQYGeiX73AaCHr2oYVGOpJcosa1B3BCG2m0K3iBgVK3iytsnC+Ec7aEBjHSO kxCcuvWkRe2FjbIsDo4ZJccDD5pZsIa/JR0Dk/W0FcF6nsS30AglsAveEI7BBYyR IKVlpVXCyJZQITCEOwZU0xZNhW0TlorPDCfOsXmSYpcw1SaTiqNyG3Al3IUqGPTO WsdYm71QoUgzc3epVF+q2VO4radKT+SNBD8sqK6BmNoIJ3IKYgGhhJ7TTBpzXE7t RQ9K2myNWPOy1QMWdWOnkV2Jybbu85vTyvF7DnIVlC9H3UulcJhoRxe0KxxWaslm FTsr4t+txN8Be2RvIy3oOUz6gQanOHtT0RSRBPrGDYto2tKbkxsiSr2Xn4vIICE/ 1Tq4lAhghjMaZkvW5xJ3AgDvzRE6DPpY2MQg4nsFTgTIL4ONCwTyCIBrnVFqVcfj PpC/CCd7I4b3eu9MCcIsB2fcOSMlZH0WIInDr7dPr4WvLxZu9nFxLqCM5Qqy20ze 6trvtnU1/wC1pmhrVL/5Zys69A0ZSJjj8iNhgSOVDNW7k0kdJfk= =1vmd -----END PGP SIGNATURE----- --mKk58lklzog0mm7o--