From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WHvKLwiJcmYtJQEAe85BDQ:P1 (envelope-from ) for ; Wed, 19 Jun 2024 07:30:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id WHvKLwiJcmYtJQEAe85BDQ (envelope-from ) for ; Wed, 19 Jun 2024 09:30:16 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=bioneland.org header.s=20230804 header.b=WYTUMuRo; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718782216; a=rsa-sha256; cv=none; b=RU8waomStBDnKOSSS1snb1FjQv+PtDzZcbgtsWh4VQSvUri2gOL/NXW5KdQZm/heWIZspl QPSwNXhIYbrg/zMqmJwGnNgZbZ/gZHNF2RLWepk5q2GAzYutcYqbdIkhUzPp6seGaW3ws9 wMXG+a0b24CFeskCdX8EN+HGri9uTtPwmHhkJEBsk4SCreJp8HGtSVzRhbEhpL3mIEqTVg iqrfZ8BPNBYxHHl/eTP8i8vWLOUuG8E3+lEXJQKDQbzFm4ruqnEqsGmBO2XX8wlQ2a2YU1 yDhmDNUuMIT+PRhy9m3tFM3R315x0rn97ww/jnRGuMB1yQIQMQK2uab8HuGukA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=bioneland.org header.s=20230804 header.b=WYTUMuRo; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718782216; 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: 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=TU89J4Zn6vd7tudu9cVmLOaegOVS/JsAfnrpyRak0No=; b=LOb+tBLZ+2dcNSQTt35OokKvn/B+V+1BTgZ4jPZwlZe8FOewrU6YMF1GASrCtZAO6ooflG Wu6pGzcZvE8P5oP6kl/HfulJliU2pEoDW1UgMW6h6QttdhPq5DEML9HT3lxZxsKLSqC5Ca GJPuoFhqHawKh3A1qOsWVB78EokDLxVQ0QHG4ELMVqJE8I9oFjcey/rtT3YQedRSKmHkCn ueN6m6RKFgCvipTOXZd9zUlAY5bAF8KKcjmTAoXkq8jrsY3DZqgFE/OIot1pTemUmV+KJV EyatuTXNmpi3UocQrqjV45Gg3T4yZFph7vsBHsjiOQKDwLEMEK3dXVF/ldv6ig== 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 63F156266A for ; Wed, 19 Jun 2024 09:30:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJplZ-0007IP-3Q; Wed, 19 Jun 2024 03:30:01 -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 1sJplX-0007I6-Lm for guix-patches@gnu.org; Wed, 19 Jun 2024 03:29: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 1sJplX-00023n-Dn for guix-patches@gnu.org; Wed, 19 Jun 2024 03:29:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJpla-0003B8-Fx for guix-patches@gnu.org; Wed, 19 Jun 2024 03:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71408] Request for merging "python-team" branch Resent-From: Tanguy LE CARROUR Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 07:30:02 +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, jgart Cc: rprior@protonmail.com, Sharlatan Hellseher , 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.171878214812102 (code B ref 71408); Wed, 19 Jun 2024 07:30:02 +0000 Received: (at 71408) by debbugs.gnu.org; 19 Jun 2024 07:29:08 +0000 Received: from localhost ([127.0.0.1]:35650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJpki-000398-8o for submit@debbugs.gnu.org; Wed, 19 Jun 2024 03:29:08 -0400 Received: from smtp-bc0e.mail.infomaniak.ch ([45.157.188.14]:53321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJpkg-00038a-CX for 71408@debbugs.gnu.org; Wed, 19 Jun 2024 03:29:07 -0400 Received: from smtp-4-0001.mail.infomaniak.ch (smtp-4-0001.mail.infomaniak.ch [10.7.10.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4W3wG332mTzP48; Wed, 19 Jun 2024 09:28:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bioneland.org; s=20230804; t=1718782107; bh=TU89J4Zn6vd7tudu9cVmLOaegOVS/JsAfnrpyRak0No=; h=References:Subject:From:Cc:To:In-Reply-To:Date:From; b=WYTUMuRoPG4v0Yt34m9AV/2WHwGWzRY/DvhaaiflUUkzTb6SGqNIQ7765uekWtrRm 5MSWWwu6DDWifm3RZehjLkj2n6rNdbCxfBduQn9Fgwk5xPvB/8ZUVpP64ymaO3s4Dm DqySDiyFtT4lU+GcTo+b6KS8gTq2oQbeGUdNwQH7Jcd3eYg9FZr5cQlTA8zYnj1Tyy 0aVkyEUhDocTma3mY90oIAwUmCaZRo5b7AA/FUP453yaVxrWpMBT0sapqO11NzdHMf cUgrknLtchAib+S5/DyQZT9c8hE4A13v4tG49dUKyUiFsLgPhpZ/59vaPG7VsFhtiA ybVxV7kp8Oocw== Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4W3wG2458Nzlh6; Wed, 19 Jun 2024 09:28:26 +0200 (CEST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable References: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> From: Tanguy LE CARROUR In-Reply-To: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> Date: Wed, 19 Jun 2024 09:28:26 +0200 Message-ID: <171878210601.5719.1846691700938340254@bioneland.org> User-Agent: alot/0.10 X-Infomaniak-Routing: alpha 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.46 X-Migadu-Scanner: mx12.migadu.com X-Spam-Score: -5.46 X-Migadu-Queue-Id: 63F156266A X-TUID: 1fgL0v0c0LPy Hi jgart, Quoting jgart (2024-06-18 22:46:47) > 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. > [=E2=80=A6] > Here's a tentative proposal, with an example:=20 > [=E2=80=A6] > I think that keeping the team branches focused on a particular team > sub-feature within that team's scope and not using long-lived and largely > scoped branches will avoid a ton of frustration trying to fix merge confl= icts > when/before we announce a request to merge. >=20 > We can then focus our focused efforts on iterating over preparing major P= ython > features and packages that require large amounts rebuilds. IM(V)HO=E2=80=A6 the smaller and the more-frequently-rebased the branches, = the better! I still haven=E2=80=99t wrapped my head around the consequences for the CI = of rebasing often =E2=80=94can a simple rebase trigger a world rebuild?=E2=80=94, but t= his is definitively something that I do =E2=80=94quite successfully!=E2=80=94 on a daily basis = in my professional life. I guess it=E2=80=99s just a matter of giving it a try and see? It=E2=80=99s= always possible to go back to the one-branch-to-rule-them-all `python-team` branch if managing multiple branches ends up being a pain, right? I also have no clue how the other teams are managing their branch and their rebase/merge policy? --=20 Tanguy