From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KHvdM7JLQWDDOwAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 21:05:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uNmOL7JLQWBqMAAAbx9fmQ (envelope-from ) for ; Thu, 04 Mar 2021 21:05:54 +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 E67ED2F921 for ; Thu, 4 Mar 2021 22:05:53 +0100 (CET) Received: from localhost ([::1]:33544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHvAP-0004dB-49 for larch@yhetil.org; Thu, 04 Mar 2021 16:05:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHvAA-0004cE-77 for guix-devel@gnu.org; Thu, 04 Mar 2021 16:05:41 -0500 Received: from dustycloud.org ([2600:3c02::f03c:91ff:feae:cb51]:55538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHvA7-00018C-Nx for guix-devel@gnu.org; Thu, 04 Mar 2021 16:05:38 -0500 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 8D80A26614; Thu, 4 Mar 2021 16:05:29 -0500 (EST) References: User-agent: mu4e 1.4.15; emacs 27.1 From: Christopher Lemmer Webber To: Leo Famulari Subject: Re: Changes to the branching workflow In-reply-to: Date: Thu, 04 Mar 2021 16:05:24 -0500 Message-ID: <874khq8wa3.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1614891954; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=/z93sQEoWZtd+uzeZILlDS+a5CifuR3zOQYcI+Ccn78=; b=kKv2N5DGJhW8ivQa+UhaXdYOtnDCVgQSLEtY6Ueyh3Lnb7z3fiDBxK5qzj88Pf1oDXdssk aSbne70pagoVJwlkwIzu6DfLlB4P3rFnyEUHGyC+UaN5aYjWTGYMIzgp/nkOP1x4nemEll Dgo8G+t5bq3lHdcXVfLNHfxZTaPvdLcXiuOe18fHVocCpwfV40FwL1d1QlKek4c4z5gbw0 oB6lJNhbIFN2FEP7+2phT90IwV5o8IgtAjTENp9CeCNZW59rgkNquxNI7/vCHuwjFFGIgL XGf72fVe6m5zcnzuvm+HyuH97l9jCtLVhwhkd3qHJwh1xjDolReQqVN+vPxb4A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614891954; a=rsa-sha256; cv=none; b=ibAJ4pJTkWP36/v/Oa/JFhp87O+9Wbw9UsMECdGU2uWx8vE2C6VGRb/8w6ewZl944w84ur /fTabU5CcQV7HIkSESjEKglUO+mpico4fVhVJTtwAbwN/gCqQSeGGPdAvBY7MtDp/inkfn btNBKBIF5qhwr14prwgelm8qOPfAs0Ljz2suRc1ldDDdgmDzO7dc9FaREl3D2DzL03U2pf 0KoURNHm15gkaVg3Zb0x4VdORL92s8ddHkGATOr1oi0BWV+3PShBafmRvpV9k/lh6KYgJP AQTqtwLLlqJ/5Nbi+UilcRLRFcRBUc094iFuCXoFvhAwzuZsX9ilgRB0BszmFg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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-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: E67ED2F921 X-Spam-Score: -2.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: lnoKRAHeHux8 Hello, As someone who jumps in and out of Guix development occasionally but who does have commit access (probably for grantparented-in reasons, heh), sometimes I don't know where I should commit code or what the current branching policy is, and I might miss emails like this. I wonder if we should formalize it. What about adding a section to the "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? I think that would help me, and maybe it would help others. Thoughts? - Chris Leo Famulari writes: > Based on experiences with the last "staging" cycle and discussions at > the most recent Guix Day meeting [0], we've changed the branching > workflow. > > The default branch names remain "core-updates" and "staging". > > When we begin actively building and testing the branches, they will be > renamed to "core-updates-frozen" and "staging-frozen", respectively. > > This will indicate that they are closed to any changes except for bug > fixes and merges of the master branch. > > During those periods, new patches can be pushed to "core-updates-next" > and "staging-next". > > Hopefully these changes will clarify the status of the branches and > reduce confusion. > > [0] https://lists.gnu.org/archive/html/guix-devel/2021-02/msg00163.html