From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wJggO5DzcWbHZQEAqHPOHw:P1 (envelope-from ) for ; Tue, 18 Jun 2024 20:52:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wJggO5DzcWbHZQEAqHPOHw (envelope-from ) for ; Tue, 18 Jun 2024 22:52:33 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b="tyJ/RsDp"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718743691; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0spGNO/IW8/KzbHjIKmyQaO11vWsN92vFow6FW+o4Fg=; b=OhN+XNzufh+rSXRFo/OIF1v0IYJlpu6XiHR5oafSn6jWMh+rbE80Z2GJC/IseV39rF1ehK vjejFs3cfaH4cMfpz0CX4etlr06idenip9NV9s2dMBDAiKK54HEpDLyaG7M3EOZ5t/QuEc zg5aw69M004lNF1sKgteKAa9Njm3PR4dvryApHPU4ex2Bnmsyg/sq6G/5AfZmly3Ai/oEL KCtgXwtUlLH/l8nRdARDCM5NuCPrf5LAOrxg0nqN2THtOWpGPDZXGdRDfc6jB5zTRq190b 9PKnaxP3tRCzdDHgggyV0BJClyHalJfBPDgP4V5tHqUxGnxJ9TxXMIzu0DjRFw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b="tyJ/RsDp"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718743691; a=rsa-sha256; cv=none; b=OA3Tl2LmNGE6YBTJSwggWA3amDQ7ODfIBgZpYKMcNvyn155+05RV49A5E9Jb9rIceNteSw 3fIaYdcFf2QutViAjxoA680zAfaukFN56R1HqwT7mJFyWXpKPPm+xxG1r8zWc8hwI28jfh 6x7Ch/QpzO1DvqNc2UimxcfL2vjD3tpiecZZ7cdUWIPRUW5ZsqceF6ddA2ztcmT01NAFIH PsMixbnbbLVK48mqlZ7/W+7vYsuUm5yzhjvOv/qMg2v1p3jefUupo+LymEC6Gvzvbfurg3 0epxgh2p9qyu83dZhdfURlzwLehqlx6EYm58SiQZa5tqckGr6NiyFf/caPq20A== 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 F2CCC52E91 for ; Tue, 18 Jun 2024 22:48:10 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJfkI-0001W2-09; Tue, 18 Jun 2024 16:48:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJfkF-0001VJ-Du for guix-patches@gnu.org; Tue, 18 Jun 2024 16:47:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJfkF-0006Jw-4r for guix-patches@gnu.org; Tue, 18 Jun 2024 16:47:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJfkH-0000Qt-TD for guix-patches@gnu.org; Tue, 18 Jun 2024 16:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71408] Request for merging "python-team" branch References: <8734pp2m98.fsf@cbaines.net> In-Reply-To: <8734pp2m98.fsf@cbaines.net> Resent-From: "jgart" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jun 2024 20:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71408@debbugs.gnu.org Cc: tanguy@bioneland.org, Sharlatan Hellseher , rprior@protonmail.com, me@bonfacemunyoki.com, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , lars@6xq.net, marius@gnu.org, Nicolas Graves Received: via spool by 71408-submit@debbugs.gnu.org id=B71408.17187436221561 (code B ref 71408); Tue, 18 Jun 2024 20:48:01 +0000 Received: (at 71408) by debbugs.gnu.org; 18 Jun 2024 20:47:02 +0000 Received: from localhost ([127.0.0.1]:51651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJfjJ-0000P6-Sg for submit@debbugs.gnu.org; Tue, 18 Jun 2024 16:47:02 -0400 Received: from mx1.dismail.de ([78.46.223.134]:26892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJfjH-0000OY-V8 for 71408@debbugs.gnu.org; Tue, 18 Jun 2024 16:47:01 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 3636148e; Tue, 18 Jun 2024 22:46:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:content-transfer-encoding:from :message-id:subject:to:cc; s=20190914; bh=0spGNO/IW8/KzbHjIKmyQa O11vWsN92vFow6FW+o4Fg=; b=tyJ/RsDpIPZfn3Czxa2tWTwkbys1K8o6gIO+t0 D89fMKPuOUCTw2fqJxOYTOojFbL8XiX5bexwFW3pxJv/vW0H7q27l6xEd4fY7rw3 hQD8BqJuAg/NFuc3lXmmYCp5aJYTm+yaawHvTh1cL26hTaWkyBsWtKetSjRcY5UG tjkHgx0puj4NvPEU7vmnyF1NC2N1VgQDz6W8aNX3kKg2CbHMxGJk08HahxEUe4L7 rTvUAXSCde7ThJcysre41WkbgIFYBmRJWvw6YtQZFDDFKFqgk0/1PDOrYIEdULAQ UDljcATPvo2gqAP7RDVhaeb44I/En7Lfg5NnvvlJt/UWwm8g== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id dfa98c46; Tue, 18 Jun 2024 22:46:48 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id d6d9ed26; Tue, 18 Jun 2024 22:46:48 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 9bb2c522 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 18 Jun 2024 22:46:48 +0200 (CEST) MIME-Version: 1.0 Date: Tue, 18 Jun 2024 20:46:47 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> TLS-Required: No X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: F2CCC52E91 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.96 X-Spam-Score: -6.96 X-TUID: ZNZD1V137QVb Hi Python Team, Guix Team at large, and Parenphilic Pythonistas, This long lived python-team branch as of today has a lot of git conflicts= if you try to rebase and/or merge it on to master. What do you think if we discuss an alternative team branch policy for the= future for feature branches that target master? Here's a tentative proposal, with an example:=20 Instead=20of having a single python-team branch, with a wide variety of n= ew Python features, what if we had, a python-team feature branch that we = work on relatively quickly? In other words, we avoid long lived branches but try to merge for example= , a new python-team-sphinx branch as soon as the "Sphinx feature" is read= y. This python-team-sphinx branch will only contain the work required to = bump sphinx to the latest version that we'd like to support. The reason I= use python-sphinx as an example is because the python-sphinx package req= uires a lot of rebuilds across many language ecosystems that use Sphinx f= or documentation purposes.=20 I=20think that keeping the team branches focused on a particular team sub= -feature within that team's scope and not using long-lived and largely sc= oped branches will avoid a ton of frustration trying to fix merge conflic= ts when/before we announce a request to merge. We can then focus our focused efforts on iterating over preparing major P= ython features and packages that require large amounts rebuilds. WDYT? jgart