From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kKx5F0crgWY2HwAAe85BDQ:P1 (envelope-from ) for ; Sun, 30 Jun 2024 09:54:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id kKx5F0crgWY2HwAAe85BDQ (envelope-from ) for ; Sun, 30 Jun 2024 11:54:15 +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=1719741255; 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=rN7p43mHuTk0b0GQ7+HN8dWjXdhbMyCShYGRGqcMLF4=; b=BYhpGI9Y6d4rf/lMXyqofN5sWLfqQO3X5je2vdVR0qnj2hWRu0roLa9uhyuk3N+vMmkB2q k2u9zGePMvCXp7FzaYXTfDFjToskCky7Ye6HKgPkXHFNfk7nugeohZ0Aat3ab2IIo9Uhd4 32IcsuJ9d+bDqDJW+O3i/VOA2GqhpnvopsF3F0SALE5sk7pfNkmC1NtBv1i5ov2Ai8K4hO OR4QVKxeq/ER2FoEbPMaKtk3WwAL2SMbrnF6PpI/rHFYPZ4cMvoVeExUAHL2rJseAl+no1 d3q1Wn5K3ngj1aOAFXiB5QtAYRum9EPevmC6UynIUQO1Aj+lWbcQEBdAQvqj0w== 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=1719741255; a=rsa-sha256; cv=none; b=bqlwd7JJanIJ5fnYUi5AojKmxOH9BcnoKYlZkMeWYM8/irbdLpiLdAB7BiwiDLFAKOK0C+ l/ueFd4Ze0gS8AVIwJqg/pRjH33S/+j/Bfh2B0A15kFtkZ54EKD6BIrZjZyE/GTwZKd9fK pEbty+fYF2LXERRlVXtWz99AaDsRfcs/SnjRxtb3J7dtQZ5ccJTwIhv3nwzMIqn25tpwjv LCOXQFEJEwPSgr72pQLaa4bVv7ixxNMG6L2PxNMocdHYj7Lo8k7ahtwdc69r1+f7bztn3I hIfeWLFh+CWjQHXfi8acBfgfjsstXylA/ddCDxFT9WkTez/EHba2a3EssDy6qw== 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 13B0626DB0 for ; Sun, 30 Jun 2024 11:54:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNrG0-0000s9-CX; Sun, 30 Jun 2024 05:54:04 -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 1sNrFy-0000s0-QK for guix-patches@gnu.org; Sun, 30 Jun 2024 05:54:02 -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 1sNrFy-0004dR-Hl for guix-patches@gnu.org; Sun, 30 Jun 2024 05:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sNrFy-00060d-A9 for guix-patches@gnu.org; Sun, 30 Jun 2024 05:54: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: Sun, 30 Jun 2024 09:54: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: 71408@debbugs.gnu.org Received: via spool by 71408-submit@debbugs.gnu.org id=B71408.171974122223070 (code B ref 71408); Sun, 30 Jun 2024 09:54:02 +0000 Received: (at 71408) by debbugs.gnu.org; 30 Jun 2024 09:53:42 +0000 Received: from localhost ([127.0.0.1]:55155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNrFd-000601-Qw for submit@debbugs.gnu.org; Sun, 30 Jun 2024 05:53:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNrFb-0005zs-SR for 71408@debbugs.gnu.org; Sun, 30 Jun 2024 05:53:40 -0400 Received: from localhost (unknown [185.201.63.252]) by mira.cbaines.net (Postfix) with ESMTPSA id D37A327BBE2; Sun, 30 Jun 2024 10:50:43 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b6379ce4; Sun, 30 Jun 2024 09:42:37 +0000 (UTC) From: Christopher Baines In-Reply-To: (jgart@dismail.de's message of "Tue, 25 Jun 2024 17:04:03 +0000") References: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> <87tthp3v2l.fsf@cbaines.net> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Sun, 30 Jun 2024 10:42:33 +0100 Message-ID: <877ce63gxi.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-Spam-Score: -8.48 X-Migadu-Queue-Id: 13B0626DB0 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -8.48 X-TUID: RMzF8imxDLfW --=-=-= Content-Type: text/plain "jgart" writes: >> 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). > > That's great 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 the python-team branch in order to reduce the size of the > branch. I can then remove those commits from the python-team branch > and force push to update 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 > smaller topic branches and make requests for those branches to merge > one at a time. If there are commits on the branch that have been submitted as patches, you might just be able to look at pushing them to master. If there are commits that haven't been submitted as patches yet, but could be pushed to master, it would be good to send them as patches so that QA can take a look. And splitting off some commits in to a more specific branch is fine as well. > Note that I have an underpowered old Thinkpad X230 laptop and will > only be able to test branches that are not too large. I tried using > QA/CI but it seemed to be in an unknown state the last time that I > tried. Any suggestions here for how to more effectively use that QA/CI > infrastructure would be much appreciated. QA has been performing recently as it's taking too long to process revisions. Let me know if things aren't working or if you have questions though and I can try and help. > I tried spending a bit of time on trying to resolve the merge > conflicts but 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 tedious 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 cleanly 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? I think making sure commits that can go to master, do go to master, is really helpful to avoid merge conflicts. It's so much more likely to have conflicts if there are changes that can be made on master, but are made on a branch, or changes that should be made on a branch but are pushed to master. > Another issue that I ran into on the branch is that there are commits > that are failing. For example, at commit > fdef5662cce6a57aa6bfa682c7260b65ce3669b8 (the borgmatic changes), > borgmatic fails. Should I remove this commit since it is broken? While ideally we'd care about the state at each commit, this doesn't really happen so it's up to you what you do there. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmaBKIlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdLXA/8DGE+vIx2DyAATEljF+IIn8cxhrFmwz2z 70CPTgoS+sOWf5ulSlZWqFTj4y8Cy6pv6b3Fw2IPSkW8iuVIjCT3Z0XNUx4tqTW1 Iv/eP3+qRPW6D11dDTBz8Qzd9XX3FuIia0DEmKjk+Yt140jvhZJMQRzYQQMs0/Jp srHKusCa9/NZOjzOErmGPJSnbPbekUS9mR/zMS27OyC+uEnZNgL1Jp/pW7SPyZXN aJLeraKhQN7NPchx9zUbeZUpl+tgJIjHcpf4neqedyYwxLEjn2iOYcapZ0z4uvC/ LJEtlxNFDZjG6y3pmbFoBHHQoVmtRJ2+qcQshzyscKqzmcZfvFSZ8AQ804FuIjEq q/7lQZuJFAXEd4941E/ukdVoyAnuvd54YpECIs7OENuZ1BmCSHtOvJYkD/DKnp7q bQb1hPz3pzumCs5WnROsA6JKEj8je3KLq5/uymP2OtwAco5NLB2K7kM0hY/Zl9my 8AQXyYXXh4HRqkvBTr6UmN5CLBGM7p6+wMo83/vXDiM7kV8stsnARVEr45DBMWix v7ikVKoNbeY1Besvr5BZld0vgNa9UNVwLIU8X9nfsvgOn23sdcaYB0v1/bl1QumT UM//or6diwyMFG2zz6zSWF2oqid0C7AmhdmHikVZr37t3Ou4zGB7UoaK88vnlhrf 6eXNQfeJhmw= =GDnz -----END PGP SIGNATURE----- --=-=-=--