From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aJCfDW1VQmAmCgAA0tVLHw (envelope-from ) for ; Fri, 05 Mar 2021 15:59:41 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qKWPCW1VQmABYAAA1q6Kng (envelope-from ) for ; Fri, 05 Mar 2021 15:59:41 +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 DFC541FE7C for ; Fri, 5 Mar 2021 16:59:40 +0100 (CET) Received: from localhost ([::1]:42594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lICrb-0000tG-L4 for larch@yhetil.org; Fri, 05 Mar 2021 10:59:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lICqd-0008TA-1M for guix-devel@gnu.org; Fri, 05 Mar 2021 10:58:39 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lICqb-0004j5-B3 for guix-devel@gnu.org; Fri, 05 Mar 2021 10:58:38 -0500 Received: by mail-wr1-x42c.google.com with SMTP id j2so2618001wrx.9 for ; Fri, 05 Mar 2021 07:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=Qhky55dxEL4rDDQwzn6LdcT5eeQXdo4w6jrXRbs1rJk=; b=sCIcmML3CK7K5rZDz7sQM/4PxT7nrWmMvD0Svw+vVdoTATXMXKoGelwftFbJfjO/N/ 0685eZ/XTnkqZ6LEttsn4wVdvRrTdnVbK9xVsmqWUOy5z2ZIOWVZRDLN6WK2b0hsMcN6 31p8mzlpdq6qiRGdXmixFJtLbCf45osCMjetSmte37E9ArYFV6VWjoUzJQG36Gkm57o8 fEht06rpT5n1mCS72xZpi0qVBOyHhmjySgWk2xbZRU1j+pSICVQ7Cx0O+8lfxZeLwgWp dqCV/fqm4Np+cArHu9FUO0tL9/Fj+S3e4VWfY63a0ot/SQUAbuekhkhPe6RT6BGFQPpY IG9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=Qhky55dxEL4rDDQwzn6LdcT5eeQXdo4w6jrXRbs1rJk=; b=jujN/YOvVoXsYGkwIIqEL7i3V+NedOPDu3zvbBrM5lGX+AFecfZcbig2bGpMj0NC9n Mu5TWfIVya4OtHGIN1Ml/6EiQE3zND1ra8dOghJvtfD3AKR9ANIK/kAzyZS0l3p2/4PX bhTJ43xvBap3W2GNHM+d214kmK56AZOoMtQWvNRkclV9wioeQJiyL4Q47cRpVgVAdqfj aqHlkknLEcmYJfnNOM3Ne1Dc27Fo0GBq+DeF0xPohbTix7cVZkI33VjoQuFSpCr0lwcI 4mubwVlLlbAUgEXVI/O/94Teisqwxd7vzZ3S36qagMZEHMHiJI387VOAN/pN78uDN1da 76KA== X-Gm-Message-State: AOAM533Jv2rURGENntauNo73/rn9iquEPZ9TbjavwNgVQbr/ZjHRWaLu 6JxARJdBzFsP8xaTyZHCuYLuh+xtRAM= X-Google-Smtp-Source: ABdhPJyHPOYu3LG4gnMruedhh5wZSn/tRlH4qSXq0rRSE5UT5krWrECd1PS3urUko+VGMm8fQjaEUg== X-Received: by 2002:a5d:564b:: with SMTP id j11mr10197150wrw.326.1614959915158; Fri, 05 Mar 2021 07:58:35 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id p1sm5239684wrx.63.2021.03.05.07.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 07:58:34 -0800 (PST) From: zimoun To: Christopher Lemmer Webber Subject: Re: Changes to the branching workflow In-Reply-To: <87sg5962de.fsf@dustycloud.org> References: <874khq8wa3.fsf@dustycloud.org> <86a6ri8tns.fsf@gmail.com> <87sg5962de.fsf@dustycloud.org> Date: Fri, 05 Mar 2021 16:52:55 +0100 Message-ID: <86wnulsilk.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=sCIcmML3; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: DFC541FE7C X-Spam-Score: -1.26 X-Migadu-Scanner: scn1.migadu.com X-TUID: +1S+HRJcJeCe Hi Chris, On Fri, 05 Mar 2021 at 10:34, Christopher Lemmer Webber wrote: > zimoun writes: >> 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 succe= ssfully >> 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-up= date=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: Point #8 in [1] answered to =C2=ABexplaining what the different branches=C2= =BB. And because it was hard to refer a specific part of [2], hence the quote, to answer to: =C2=ABwhen you have a patch that's been approved, when= to push it to which branch?=C2=BB, especially to know the status of the branch. Sorry if I have been unclear. Cheers, simon