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 QBvWFLgKe2ZKkgAAe85BDQ:P1 (envelope-from ) for ; Tue, 25 Jun 2024 18:21:44 +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 QBvWFLgKe2ZKkgAAe85BDQ (envelope-from ) for ; Tue, 25 Jun 2024 20:21:44 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=NQoqJ6Ry; 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=1719339704; 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=rtzxKQyAlu7iLiLazxCrJ/Izu1Jk9XaMpTBuTwTyWlI=; b=eZmtuE2kqLbYdM7cNM5OgSk5WR8rjDAuk4i19gF13HfvekH/Kff6mWvMKg+97Q8QgDWXDb BzjwWPNrGNW8Et2eK4ItkIoOPz4fMtliU0jRwZZAtTgTTNVn6rmRorxBK+j5EGx8Bddy7K 624bXh1gGe1ZxzIXsGyEYCX8wEtBQQxEflfXFcCJcMKTlJh9VKPzjikY0erE9jCRDSymzS ye5keqFG1SUUaMXV2EwYFcco6CRvJuipqKTW7YEXI9pD8/7oRRUCVPhTKM3qAFB/8oNRtV bYf22jKzlFZJPP0R6o9DZ1+pjUQn+7b4cvpRs1PtiLdKZqlP6A0N3E4eyvT36A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=NQoqJ6Ry; 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=1719339704; a=rsa-sha256; cv=none; b=qbszaInRMpDSW5n0el4MWUEMnKY5Q+9A2TlVC5sZng6ZS3MYz3m5oN7rMkCYuAGGCrUChc pftCHEPISYZpaB9lpsjmjTl3UUhhYerB8PFzA3Yg1VmJsx0Atr7nSmM/lxvI9DI3xQKWwk 3urq+hHNmD7f1Jz2NET89LmGPCyoVDbYX+FOTjuByPnkH8jGGamf3usAfj2RmzmhaheFhw +hC7jCRH1tlg1LkPZIg5QSNS1Udb6QwR39BpocvjUVzgpVieYindoPWOVtB9Et3KyQJ1Cz BGowUMz6H+sKOdiLhHg3tczcqPzgRwtnIRskczvusQzDDFo6UZ3Ku9YJwkCqXA== 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 A887221B3B for ; Tue, 25 Jun 2024 20:21:43 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMAkq-0005Dh-QY; Tue, 25 Jun 2024 14:19:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMAjk-00053W-Hg for guix-patches@gnu.org; Tue, 25 Jun 2024 14:17:50 -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 1sMAjU-0003ml-DD for guix-patches@gnu.org; Tue, 25 Jun 2024 14:17:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMAj0-0002or-7z for guix-patches@gnu.org; Tue, 25 Jun 2024 14:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71408] Request for merging "python-team" branch Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Jun 2024 18:17: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: Nicolas Graves , me@bonfacemunyoki.com, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , lars@6xq.net, 71408@debbugs.gnu.org, marius@gnu.org, tanguy@bioneland.org Received: via spool by 71408-submit@debbugs.gnu.org id=B71408.171933937710777 (code B ref 71408); Tue, 25 Jun 2024 18:17:02 +0000 Received: (at 71408) by debbugs.gnu.org; 25 Jun 2024 18:16:17 +0000 Received: from localhost ([127.0.0.1]:37651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMAiA-0002ne-8p for submit@debbugs.gnu.org; Tue, 25 Jun 2024 14:16:17 -0400 Received: from mail-ed1-f54.google.com ([209.85.208.54]:54669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMAhk-0002mg-Me for 71408@debbugs.gnu.org; Tue, 25 Jun 2024 14:16:08 -0400 Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-57d280e2d5dso6040883a12.1 for <71408@debbugs.gnu.org>; Tue, 25 Jun 2024 11:15:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719339267; x=1719944067; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=rtzxKQyAlu7iLiLazxCrJ/Izu1Jk9XaMpTBuTwTyWlI=; b=NQoqJ6RyRo8e5yQNo4ZcTEQhK6485TTrCLNiG4FKYQsn1fHJ2aTfcfxBQ3sRWPEWNs ftJVDyMw7jW8mzSvRWkOTeUfjZQDsZcIDCS42aJG6BWWHci3ifNQAZDjuDGgx83kjj+7 o0AHRBsDwnyg0wP0KY38mCsbDd8+82oZoJx/wcpO1PtOERXYu3qiRy+h1aCK49MzOMBF w1F+dP4VJ2YVGU7MFmjPYYb/DNBh87ojDW8tIy41tvhucO9BGUCWxFDe2lyDsHShupnb 2QO51KXhhggJXohetBcM3uGs8oAra13/4epN1pqfIF9UQQVXwe+jkIx6Bx5NbV2lYFfY cEMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719339267; x=1719944067; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rtzxKQyAlu7iLiLazxCrJ/Izu1Jk9XaMpTBuTwTyWlI=; b=mhe+G5HPehDLc4AtsU42rOY+baQBsDJyU90/ouYGwQjDgzj60Z2GFi3TfzYmKnM7n1 C49pmNDSAu9apLsupIqQ5Eo3bFFJayrXadde+eoRlD1kVSMslLt5y65wwwdWUDMynKOd /TH1OMIfEEAPjHSl2kyOW+RWZX3GxuXDLhjIxqX/R8NGpqX6JhUeX68bZUD8fC0wK6eG vMAQ1SxU6JxakWShinfNH4zetP61b942NGSfZ/7yoVPUW1e3Yyfo125slmarPBLN/XZ0 h94+e23HGorYZ5KrdQ4aMoVIp95J6LTDH1kIn1stKnYJR8NE5T7BrXG7ujAm40W/zwcA U6wg== X-Forwarded-Encrypted: i=1; AJvYcCWuKktARaKIw+XK5L7HJk2bpbEVUb7hxzuJRuVb7mbURCOJGiM2OmPQnzBzKv9l193kfk0hUytij1DzjrYyl9g3OWJohQc= X-Gm-Message-State: AOJu0YzdRwnlRZV1gZ8iRFGsF+lPKZ5r79l0HOzxWRYQDl0tdXPNObAT iHaVoSFjiV37m578ZAy5lf0EPhuwVjCiexAxFZZ2bq3qySofijyMdqUhX8K/i4/Cfd/iA2dsGaD zVBiNN4EpN3iD4uMyb771T+xba8fFRbe7Fv0= X-Google-Smtp-Source: AGHT+IHfCvYMioQCiZLHeR+t2diuZJv8Tql3luwwAvkTR8PlgAIvpCYIlEMDkL3efkLXBjoWxICylZ1nIyj8LWcoHCc= X-Received: by 2002:ac2:5f4e:0:b0:52c:e030:144e with SMTP id 2adb3069b0e04-52ce185ecd4mr4721583e87.47.1719338774374; Tue, 25 Jun 2024 11:06:14 -0700 (PDT) MIME-Version: 1.0 References: <330818cb39329dd4ded9d263f69d26e306b25f31@dismail.de> <87tthp3v2l.fsf@cbaines.net> In-Reply-To: Date: Tue, 25 Jun 2024 19:06:02 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: , From: Sharlatan Hellseher via Guix-patches Reply-To: Sharlatan Hellseher 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: -3.91 X-Migadu-Queue-Id: A887221B3B X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.91 X-TUID: tw8A54WruUZO Hi, @jgart Please let me know if you need a quick test of changes, I've got som= e computer recourses at home. Thanks Oleg On Tue, 25 Jun 2024 at 18:04, jgart wrote: > > > 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). > > Hi Christopher, > > 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 re= move 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 smal= ler topic branches and make requests for those branches to merge one at a t= ime. > > 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 it = seemed to be in an unknown state the last time that I tried. Any suggestion= s here for how to more effectively use that QA/CI infrastructure would be m= uch 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 t= o fix so many merge conflicts. The process is also currently very tedious t= o 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 fdef5662cce6a57aa6bfa682c7260b65ce366= 9b8 (the borgmatic changes), borgmatic fails. Should I remove this commit s= ince it is broken? > > all the best, > > jgart --=20 VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/ GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5 =E2=80=A6 =D0=BD=D0=B0=D1=88 =D1=80=D0=B0=D0=B7=D1=83=D0=BC - =D0=BF=D1=80= =D0=B5=D0=B2=D0=BE=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B0=D1=8F =D0=BE=D0=B1= =D1=8A=D1=8F=D1=81=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F = =D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B0 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=B0= =D1=8F =D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D0=B0 =D0=BD=D0=B0=D0=B9=D1=82=D0=B8 =D1=81=D0=BC=D1=8B=D1=81=D0=BB =D0=BF=D0=BE= =D1=87=D1=82=D0=B8 =D0=B2 =D1=87=D0=B5=D0=BC =D1=83=D0=B3=D0=BE=D0=B4=D0=BD= =D0=BE, =D0=B8=D1=81=D1=82=D0=BE=D0=BB=D0=BA=D0=BE=D0=B2=D0=B0=D1=82=D1=8C = =D0=BB=D1=8E=D0=B1=D0=BE=D0=B9 =D1=84=D0=B5=D0=BD=D0=BE=D0=BC=D0=B5=D0=BD, = =D0=BD=D0=BE =D1=81=D0=BE=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=BD=D0=BE =D0=BD=D0=B5 = =D0=B2 =D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B8 =D0=BF=D1=80= =D0=B8=D0=BD=D1=8F=D1=82=D1=8C =D0=BC=D1=8B=D1=81=D0=BB=D1=8C =D0=BE =D0=BD= =D0=B5=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D1=83=D0=B5=D0=BC=D0= =BE=D1=81=D1=82=D0=B8.