From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 AIs9LWHhcmZ85AAA62LTzQ:P1 (envelope-from ) for ; Wed, 19 Jun 2024 13:47:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id AIs9LWHhcmZ85AAA62LTzQ (envelope-from ) for ; Wed, 19 Jun 2024 15:47:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718804833; 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: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; bh=feYYWFvPfRUZTND0x0OfQk8MTfw4KpDPJP3Eof9nFjE=; b=QEuHwCnIWLr27kwpShUaeCTn90a+4Fj5M0LcS3I9WZS7eluXDEOfggny64PfF+A6yn2GLN nuQlo1XyQeOQokdRW64fdBg8XgIjEZm/1GzlDQ69+7dZwy2hvsDbOhwclgYrMnKO2AWNM9 lsKF3fxpQfKFLJaYZl7mNnDVDCJATXWmkBirzvFg6Biyuf67ZMKPBY+jza+HXclxH5pW3R j09EfjT4LIrEvxYKGn3YhW7fBASPZd5b2ndqPALCca+lQVZnQ8j8k7VgF5BqQmPxGKKBMV boTkDCRswmhKYvNLs6ZoWXxI/991ccQ4PHi/D8v8l99FfSFvFVE5aThzwAI8dw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718804833; a=rsa-sha256; cv=none; b=na1/ibeQWrt7fQVe3lQfsbD5MNmrKkgjKnERaz/2pz1k4i7GoLXdb6Rg5Vzom/iLlOAQis fMksujRA+dERlQIgG3Pu34peQNWCmo/YnkwPS4Luz6i86/wUF6AxwD4gydbF0+6aoIywNq nCQd7yZzIrnmFJAv/hMdQ/I/mBHGgoNDSRM4nFg4V9ZOjpaBiltAMowNGSfKpUPMYHx4Uz Ljvo5D7GeFR2MSa6S9a2gTtCTT1SjnQOcgfdgvbw2BFACvOVrco+KsGTN01X2mXvBowDOW E8C/9zIxE/jUXfvTRvwHDDa+/M+IN0q9Qn76QCGGhJBu/EWhYpyB0j+SkFHA0g== 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 7C7F157210 for ; Wed, 19 Jun 2024 15:47:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJveO-0007r7-HF; Wed, 19 Jun 2024 09:47:00 -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 1sJveN-0007qx-ID for guix-patches@gnu.org; Wed, 19 Jun 2024 09:46: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 1sJveN-0001s0-Ak for guix-patches@gnu.org; Wed, 19 Jun 2024 09:46:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJveQ-0000rG-7H for guix-patches@gnu.org; Wed, 19 Jun 2024 09:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71408] Request for merging "python-team" branch Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 13:47: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: "jgart" Cc: tanguy@bioneland.org, Sharlatan Hellseher , rprior@protonmail.com, me@bonfacemunyoki.com, Ludovic =?UTF-8?Q?Court=C3=A8s?= , 71408@debbugs.gnu.org, lars@6xq.net, marius@gnu.org, Nicolas Graves Received: via spool by 71408-submit@debbugs.gnu.org id=B71408.17188047623182 (code B ref 71408); Wed, 19 Jun 2024 13:47:02 +0000 Received: (at 71408) by debbugs.gnu.org; 19 Jun 2024 13:46:02 +0000 Received: from localhost ([127.0.0.1]:44274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJvdS-0000pD-3u for submit@debbugs.gnu.org; Wed, 19 Jun 2024 09:46:02 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJvdP-0000om-2D for 71408@debbugs.gnu.org; Wed, 19 Jun 2024 09:45:59 -0400 Received: from localhost (unknown [212.132.255.81]) by mira.cbaines.net (Postfix) with ESMTPSA id 9C17327BBE2; Wed, 19 Jun 2024 14:45:24 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 57f7c7c9; Wed, 19 Jun 2024 13:45:24 +0000 (UTC) From: Christopher Baines In-Reply-To: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> (jgart@dismail.de's message of "Tue, 18 Jun 2024 20:46:47 +0000") References: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Wed, 19 Jun 2024 14:45:22 +0100 Message-ID: <87tthp3v2l.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 7C7F157210 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.96 X-Spam-Score: -7.96 X-TUID: TMF3I/Un1QtZ --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable "jgart" writes: > 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 of having a single python-team branch, with a wide variety of > new 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 ready. 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 requires a lot of rebuilds across many > language ecosystems that use Sphinx for documentation purposes. > > 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 conflicts when/before we announce a request to merge. This aligns with the current (and previous) guidance on managing branches [1]. Providing there's a consistent topic for the branch, any name is fine (e.g. python-team-sphinx is fine). 1: https://guix.gnu.org/manual/devel/en/html_node/Managing-Patches-and-Bran= ches.html I'm also hoping the requirement to create a guix-patches issue requesting to merge the branch when it's created will help avoid the long lived branches that we've had over the last year. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZy4PJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfhIA/9HdUfBn4QFicBFDWT3iL1cMSZTpqMbwX/ iKX+rir4/nYWCKNZgzfb3T+hYLN/VpyKqxj7jBOAvPVmZrt0ur/UQ34BnpTMnAH3 j4aOQ/tUAYkrR9FE9kymPXl9FIP6gFODo16fH7rI5O15zdxOqIilmHZw5P+48+vu gTOjXfGRJfI1lBiZMcdqompe2T9Hz47Y188ddxFzvgQpYh79V7LSRKrb1OKMjbF+ j3yIV/H/9tQRzswqp0J1fx+dlXhZAdfqvh7QQ3bLLKA5hC3BYRLiBMMLM16STBj0 uNM0zDvwVuCnYsz8N0ck0B5tOga2aOOQUhuiUlSzVzXLCiDD/p3rivQNtQ71v7Zt c81HLhnNz4KoEyA8hYefeDi09Z0+gjxMlDdCJdIZl6vdq25BJgLlEl7bmRnjuuhn c4zDf5ZN5nnOK+QzCmstS4dkbkiYjSEqaYhkBXKub9cWLweCigIXgP2bAgIi6Hg7 dhVuAXyl8PD///0cmEhxWttiHoFWTgvz6k5LNBx90krIZO120pVVNy2o2ptBaAl4 ke/zaQPHgYuEiLG53cZOmG+cfxAFLpGxRu9hYuS/0KRrccknZfNc1pNenmKXlvDj GiAEiQAvoLHAQcgt2E0nHGEj8NwxvoNrzpJ0ZoMEkxeXhalbw2KcGjRXti/KAoFR vcm7yIMPrTE= =P69h -----END PGP SIGNATURE----- --=-=-=--