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 iEedFRy3J2D5PAAA0tVLHw (envelope-from ) for ; Sat, 13 Feb 2021 11:25:16 +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 OEhBERy3J2C2OQAAbx9fmQ (envelope-from ) for ; Sat, 13 Feb 2021 11:25:16 +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 5C3F523F95 for ; Sat, 13 Feb 2021 12:25:15 +0100 (CET) Received: from localhost ([::1]:46832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAt34-0004A2-HD for larch@yhetil.org; Sat, 13 Feb 2021 06:25:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAt2n-00049h-A9 for guix-devel@gnu.org; Sat, 13 Feb 2021 06:24:57 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:51049) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAt2l-000575-Pz for guix-devel@gnu.org; Sat, 13 Feb 2021 06:24:57 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4Dd7Lt0np1z1qs3M for ; Sat, 13 Feb 2021 12:24:54 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Dd7Lt0hnLz1sP6j for ; Sat, 13 Feb 2021 12:24:54 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id RfjdUDCOOR0q for ; Sat, 13 Feb 2021 12:24:53 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-48-19.dynamic.mnet-online.de [188.174.48.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Sat, 13 Feb 2021 12:24:53 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id CE02E60196 for ; Sat, 13 Feb 2021 12:24:50 +0100 (CET) Subject: Re: Changes to the branching workflow From: Hartmut Goebel To: guix-devel@gnu.org References: <87im6xd17e.fsf@nckx> <877dndcc6t.fsf@nckx> Organization: crazy-compilers.com Message-ID: Date: Sat, 13 Feb 2021 12:24:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: none client-ip=212.18.0.9; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.119, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , 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: 5C3F523F95 X-Spam-Score: -2.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: ajstumxx+LDy Am 12.02.21 um 21:49 schrieb Andreas Enge: > From what I understood of the discussion, I would also go with Tobias's and > Efraim's suggestion: There is a core-updates branch that is constantly open > and where people can push; this does not seem to leave a possibility of > mistake, almost by definition. Then we can branch off core-updates-frozen, > which is frozen :), except for cherry-picked bug fixing commits and merges > from master. Once it is finished, it is merged into master and deleted. This is what I understood, too. > Technically speaking, this is the same as your suggestion, Leo, but it > avoids the constant dance between core-updates, that disappears and > reappears under the name core-updates-next, that disappears and reappears > under the name core-updates, and so on. It's even worse: When removing staging and core-updates at Savannah, this does not effect local copies. Thus one might push these branches to Savannah, which might lead to a lot of confusion and trouble. -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible |