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 0G1aA68YKGB2eAAA0tVLHw (envelope-from ) for ; Sat, 13 Feb 2021 18:21:35 +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 kLKgOq4YKGDWYgAAbx9fmQ (envelope-from ) for ; Sat, 13 Feb 2021 18:21:34 +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 B5E3110E7D for ; Sat, 13 Feb 2021 19:21:34 +0100 (CET) Received: from localhost ([::1]:38346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAzXx-00022u-Rc for larch@yhetil.org; Sat, 13 Feb 2021 13:21:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAzXp-00022n-DZ for guix-devel@gnu.org; Sat, 13 Feb 2021 13:21:25 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:57403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAzXn-0006rr-CH for guix-devel@gnu.org; Sat, 13 Feb 2021 13:21:25 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id B576D49E; Sat, 13 Feb 2021 13:21:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 13 Feb 2021 13:21:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=+Ff3yy7o8CJOVPsRGf+/m5Uv XO/XO9jjV0fkVQG8pWw=; b=gpff8AVRfPJmGNIW0lhOKShVJCr/+859JZDD+emm 6JyjvRb/M7vNebPhPoCc429VVGyXSvlZFd51BOkZ8HL6fhG2QARaDYwaHi5HuNV2 5PoVY2Qcf3+M1pEBWlAwyRpKb/Jj8sUPvtgX3WfIn/uIUgQlcM+H26QkbrizlOK0 9uw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=+Ff3yy 7o8CJOVPsRGf+/m5UvXO/XO9jjV0fkVQG8pWw=; b=qhI4AemLGxRn4ppqVKBtJh 4dWlbUQTHQ5qblp2WBRLnnHAemUYYSOiynddKQs7Occ08gSf+l7Ut1sZErdbkT9G qTKXe0NgKa//4xNO5UI6FzCAhgaJnwjPQrpGe9TeCu3ZFuQpXgMCa05n6qO/xAQP MmRNFC/IhNCCR9WQvD2Ws7LPHlN3aoIwpuOacd7CgLuIwYw1fSHVE+IKa+GeSr18 i5dmqt23JXt1H9u6oftKY/xG3j/2zBqPxVP40w+PBgVAK0RjeR+/erL5v9vQ59YE HYrcVA0BuY7acH0yLy3iuWSz8xyzpstFn4edCOqHBcwJU5YGuaDTclVuAByZK8qQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrieefgddutdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucfkphepuddttddruddurdduieelrdduudeknecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id AC8C7240062; Sat, 13 Feb 2021 13:21:18 -0500 (EST) Date: Sat, 13 Feb 2021 13:21:16 -0500 From: Leo Famulari To: Hartmut Goebel Subject: Re: Changes to the branching workflow Message-ID: References: <87im6xd17e.fsf@nckx> <877dndcc6t.fsf@nckx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=64.147.123.19; envelope-from=leo@famulari.name; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.56 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=famulari.name header.s=mesmtp header.b=gpff8AVR; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=qhI4AemL; 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: B5E3110E7D X-Spam-Score: -2.56 X-Migadu-Scanner: scn1.migadu.com X-TUID: BnPGGqmPFZ8o On Sat, Feb 13, 2021 at 12:24:50PM +0100, Hartmut Goebel wrote: > 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. Alright. Due to overwhelming demand both on and off list, the bikeshed has been repainted.