From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id OIp3G6tRQmCxWQAA0tVLHw (envelope-from ) for ; Fri, 05 Mar 2021 15:43:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +BAhF6tRQmDcKAAAbx9fmQ (envelope-from ) for ; Fri, 05 Mar 2021 15:43:39 +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 C11628B17 for ; Fri, 5 Mar 2021 16:43:38 +0100 (CET) Received: from localhost ([::1]:59250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lICc5-0000uE-NI for larch@yhetil.org; Fri, 05 Mar 2021 10:43:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lICTA-0007Ad-NG for guix-devel@gnu.org; Fri, 05 Mar 2021 10:34:24 -0500 Received: from dustycloud.org ([2600:3c02::f03c:91ff:feae:cb51]:56072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lICT8-000289-Tw for guix-devel@gnu.org; Fri, 05 Mar 2021 10:34:24 -0500 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 72A5A2663C; Fri, 5 Mar 2021 10:34:21 -0500 (EST) References: <874khq8wa3.fsf@dustycloud.org> <86a6ri8tns.fsf@gmail.com> User-agent: mu4e 1.4.15; emacs 27.1 From: Christopher Lemmer Webber To: zimoun Subject: Re: Changes to the branching workflow In-reply-to: <86a6ri8tns.fsf@gmail.com> Date: Fri, 05 Mar 2021 10:34:21 -0500 Message-ID: <87sg5962de.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2600:3c02::f03c:91ff:feae:cb51; envelope-from=cwebber@dustycloud.org; helo=dustycloud.org 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@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.36 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: C11628B17 X-Spam-Score: -2.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: 7GMoF+Lq5ilc zimoun writes: > Hi, Chris, > > On Thu, 04 Mar 2021 at 16:05, Christopher Lemmer Webber wrote: > >> I wonder if we should formalize it. What about adding a section to the= =20 >> "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: > 2: > > In [2], it reads: > > For patches that just add a new package, and a simple one, it=E2= =80=99s > OK to commit, if you=E2=80=99re confident (which means you succes= sfully > 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 =E2=80=99staging=E2=80=99 or =E2=80=99core-upd= ate=E2=80=99 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: Depending on the number of dependent packages and thus the amount of rebuilding induced, commits go to different branches, along these lines: 300 dependent packages or less =E2=80=98master=E2=80=99 branch (non-disruptive changes). between 300 and 1,800 dependent packages =E2=80=98staging=E2=80=99 branch (non-disruptive changes). This = branch is intended to be merged in =E2=80=98master=E2=80=99 every 6 weeks o= r so. Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, =E2=80=98gnome-updates=E2= =80=99). more than 1,800 dependent packages =E2=80=98core-updates=E2=80=99 branch (may include major and pote= ntially disruptive changes). This branch is intended to be merged in =E2=80=98master=E2=80=99 every 6 months or so. I guess I hadn't read that part of the manual. Oops! So it does seem well answered. Good! - Chris