From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id KOEDFrX6emYzVwEA62LTzQ:P1 (envelope-from ) for ; Tue, 25 Jun 2024 17:13:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id KOEDFrX6emYzVwEA62LTzQ (envelope-from ) for ; Tue, 25 Jun 2024 19:13:25 +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=ORzSDOWd; dmarc=pass (policy=none) header.from=gnu.org; 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=1719335605; 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=FTolSH6OxFHbIiTcgF72LTTBFgVhUxJMSXCtf9gsCFg=; b=L9FjliBdw7bYUFUg1hUQ16rO2PiGW71fK4COkQVTSyEpJdOTa0p1VG47LDaH2aq2TlyS0+ uyTze4jGvCuzms5Onzuzp3j4i7G4AYSzu7RFufkIxojApyBg6SayDM1OiAI784QcVSRhjs uTCZzlcOkbpiv32sEK/9WYTaB5s6mY5oKAWyrrp4XDZllD15PGScBcscn4hJ5aa1z1nt+5 YFKyjr7cmj1FJyHiWc7GpnAEWCEIv+KC6O6FlLvOSTWNBFFNhA19RM69XalzOxaKivsNwB 531XMKD1aqewrockd+VJJ7eU87E01Lgyl417uHpJOInkGnNxpRM981ryKiIr4w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719335605; a=rsa-sha256; cv=none; b=DY6FZ2Z48NSVpUhLKQle6wP3UWY0yU2X5mEyVNvQa7yCiu1aEbxnztivo42uhj7KokDHNA EX/coReqNpPCYYBAnnSBwYwmAag9P+yik1VYGjKZqpkNn/XMyFCyTl9c0JK61lRHNG5ULf EEUEQY2/l4azlIuV13LGmQdHiB1M7LSx9w+44R7lATk/havyZH+26j5xxs2d+Ot2LIffq9 xeAhkpfAEx0/d30d5LkC6Yzt/FOrEFKLajS57X/HdYR4sOxruEXEnWX4n3JmivXi1Lk04O m9SMC2L8M340Z4/WeoadJAFcPmALARoCuYevWlFewqqr5c8bOllDJqyUa2FkOQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=ORzSDOWd; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 2831E9E40 for ; Tue, 25 Jun 2024 19:13:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sM9gz-0006dT-01; Tue, 25 Jun 2024 13:11:07 -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 1sM9er-0006UA-7V for guix-patches@gnu.org; Tue, 25 Jun 2024 13:09:49 -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 1sM9ed-00026u-9J for guix-patches@gnu.org; Tue, 25 Jun 2024 13:08:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sM9bK-0001AP-7O for guix-patches@gnu.org; Tue, 25 Jun 2024 13:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71408] Request for merging "python-team" branch Resent-From: "jgart" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Jun 2024 17:05: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: "Christopher Baines" Cc: tanguy@bioneland.org, Sharlatan Hellseher , 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.17193350884460 (code B ref 71408); Tue, 25 Jun 2024 17:05:02 +0000 Received: (at 71408) by debbugs.gnu.org; 25 Jun 2024 17:04:48 +0000 Received: from localhost ([127.0.0.1]:37627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sM9az-00019h-7X for submit@debbugs.gnu.org; Tue, 25 Jun 2024 13:04:48 -0400 Received: from mx2.dismail.de ([159.69.191.136]:26471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sM9ai-00018z-Da for 71408@debbugs.gnu.org; Tue, 25 Jun 2024 13:04:39 -0400 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 1e22d514; Tue, 25 Jun 2024 19:04:04 +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:in-reply-to:references; s=20190914; bh=FTolSH6OxFHbIiTcgF72LTTBFgVhUxJMSXCtf9gsCFg=; b=ORzSDOWdhjwX FkngA4L5BiWZKWpEjAv+xltz4lIwK8fW6eXmIRzztLXc84J16CNknfYZFQmohr8p IiAMRFVFeWTnZaNO3LKFuycbs7JHV8ehSJr3GI/EZA7nkTuVml1susn8pBv3ClBM QCjxHqlmRBEwbmB/xOJchy5eWd7gQqYmoCevyDoKHzTah/BtUZ576Z8rxum3XjZM BSt5YJJ7TBhVaE+wzwKNZxNAIjQLjcM7+/foXB7mYn6Qup1m3mS2A9wtuVg90HPl RfHYBnFKRlBPfqGOb7Ur/ybSPC7nzqmY8eGEpRy3rm6TM8qpjM26k4/nu+Iw9GqQ IBW/NeKj3Q== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx2.dismail.de (OpenSMTPD) with ESMTP id fcc0b4ef; Tue, 25 Jun 2024 19:04:04 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id b0ee007b; Tue, 25 Jun 2024 19:04:04 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 990c9640 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 25 Jun 2024 19:04:03 +0200 (CEST) MIME-Version: 1.0 Date: Tue, 25 Jun 2024 17:04:03 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: TLS-Required: No In-Reply-To: <87tthp3v2l.fsf@cbaines.net> References: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> <87tthp3v2l.fsf@cbaines.net> 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.07 X-Spam-Score: -4.07 X-Migadu-Queue-Id: 2831E9E40 X-Migadu-Scanner: mx11.migadu.com X-TUID: +JIMTZh1BpEB > This aligns with the current (and previous) guidance on managing >=20 >=20branches [1]. Providing there's a consistent topic for the branch, an= y >=20 >=20name is fine (e.g. python-team-sphinx is fine). Hi Christopher,=20 That's=20great that my proposal already aligns with the current guidance. I am going to try to start cherry picking uncontroversial and non failing= patches on the python-team branch on to master and removing them from th= e python-team branch in order to reduce the size of the branch. I can the= n remove those commits from the python-team branch and force push to upda= te it. What do you think of this approach before I attempt it? I'll wait = on your guidance before doing this. Another approach I can take is to break the branch apart into 2 or 3 smal= ler topic branches and make requests for those branches to merge one at a= time. Note that I have an underpowered old Thinkpad X230 laptop and will only b= e able to test branches that are not too large. I tried using QA/CI but i= t seemed to be in an unknown state the last time that I tried. Any sugges= tions here for how to more effectively use that QA/CI infrastructure woul= d be much appreciated. I tried spending a bit of time on trying to resolve the merge conflicts b= ut it quickly lead down a long rabbit hole and I only have a limited time= to fix so many merge conflicts. The process is also currently very tedio= us to do with high amounts of accuracy due to their being 1. Lots of commits that I am not familiar 2. Lots of commits 3. The branch has diverged alot since latest master so things don't clean= ly apply anymore What do you think of this current approach of cherry picking good commits= off of the python-team branch in order to reduce the size? Another issue that I ran into on the branch is that there are commits tha= t are failing. For example, at commit fdef5662cce6a57aa6bfa682c7260b65ce3= 669b8 (the borgmatic changes), borgmatic fails. Should I remove this comm= it since it is broken? all the best, jgart