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 AK6OIsHn3mYr7wAA62LTzQ:P1 (envelope-from ) for ; Mon, 09 Sep 2024 12:19:13 +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 AK6OIsHn3mYr7wAA62LTzQ (envelope-from ) for ; Mon, 09 Sep 2024 14:19:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CRPqa564; dkim=fail ("headers rsa verify failed") header.d=futurile.net header.s=selector1 header.b="0URF/e3r"; 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=1725884353; 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=SgyjOy50QoIVZUYy6vf9P2SLlmo15N9GmY9TYa/93cQ=; b=ZnNil41SjB4Kx1ujkCCrln9+BF5CwyLPbXQ85yNMPbhs3/THrfhfWQZtUNkb0Tn2puJDYu Dn3O/2q3sR+7qmZRi+uLDUZzzuTjq6csrqGdF3cPmYDeLV6XZEo2saR3W0vratXJNJgPhz 6+Ah5onvG4kRCLXl7a9Xo03qm+3yMkYQ1pgS4NNV5F1jofTBMGWGVIF7PfVKy+KuZd0SmS oAfQ1db/XvVDF8W4wQg9Eg44GJRc3Mjc8/2wkGKgC3Gq/Ten9cgpvBN8U/IYfo8nISqSlq L40HJAFZ1ZfWri2904g/IV7+ENpK5DhKrs+NpicxbPXMxwroBjmTeDIbts/oSQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725884353; a=rsa-sha256; cv=none; b=e9m2rY3fDN659KmJP203Ug5/dvND0R7DwpDJwN50Tld2dTFm6RJykAvVXP1IjQ5lNMOHzT OsLD9tzpk13VcjDbBevflbsoS81Mvkaw0Jg9GXwOkipqULixZ0nXM8+RWjjOAfkn84etSe nEK3Dny7P25vpNv85KI0GuiDfWOV1l6wzzp61UmSrZbHF5eEsmVIcWwntFwk78MUrfq1fx oi9sIViXvE8MBdhmA02TOw2jco5zRQwxSW3IVGy8wqiskhNB2omaSelcSfcBN4Z9eTI7RN ce3P/xrbpnnXu9+MgACiC/j97I74IBbxrwDS1txVAuPN/vISO3oK79BORG4G0Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CRPqa564; dkim=fail ("headers rsa verify failed") header.d=futurile.net header.s=selector1 header.b="0URF/e3r"; 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" 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 B63D36C192 for ; Mon, 09 Sep 2024 14:19:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sndMD-0007MF-C8; Mon, 09 Sep 2024 08:19: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 1sndMB-0007M6-EE for guix-patches@gnu.org; Mon, 09 Sep 2024 08:18: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 1sndMB-0006th-4N for guix-patches@gnu.org; Mon, 09 Sep 2024 08:18:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=SgyjOy50QoIVZUYy6vf9P2SLlmo15N9GmY9TYa/93cQ=; b=CRPqa564gt0sA2IRzU1K2gt2ojaSjk5LTGxd0RwJYovYCgYP7tDhGVXzq3POyvnOyhDv2w81NwRGl6JYmMuxK9NPwOwvPl0rzEUf7d+QZxT07fkpgrJoh6gD191N5Qorlg2F10sp9d+uRhPxJkq5BNdBhxyqdkJhBgZcTO466bp2XFxawQJYg+E9aiL+64t/597/FMZzJa9gATSBMfGRggruuurjbs2iopizo/7K70HjPKrTrl5/WUTMxnYqxpe7NBCn8NH1iPq4LWz2mI++phwtfeN+Bmupy4Dw26ap+6UB9FgB731cdXxWmsIm9UGiTrpt2fuaDv0yxJydxIEvww==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sndME-0001qb-8B for guix-patches@gnu.org; Mon, 09 Sep 2024 08:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73038] [PATCH 0/2] Update borgmatic to 1.8.14 Resent-From: Steve George Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Sep 2024 12:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73038 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: jgart Cc: 73038@debbugs.gnu.org Received: via spool by 73038-submit@debbugs.gnu.org id=B73038.17258842997043 (code B ref 73038); Mon, 09 Sep 2024 12:19:02 +0000 Received: (at 73038) by debbugs.gnu.org; 9 Sep 2024 12:18:19 +0000 Received: from localhost ([127.0.0.1]:60826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sndLW-0001pU-Tv for submit@debbugs.gnu.org; Mon, 09 Sep 2024 08:18:19 -0400 Received: from mailtransmit04.runbox.com ([185.226.149.37]:51458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sndLU-0001pC-EJ for 73038@debbugs.gnu.org; Mon, 09 Sep 2024 08:18:17 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1sndJD-00B337-R7 for 73038@debbugs.gnu.org; Mon, 09 Sep 2024 14:15:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=SgyjOy50QoIVZUYy6vf9P2SLlmo15N9GmY9TYa/93cQ=; b=0URF/e3rGfowHdRrZpUXl4Kt+/ REN11iZll1kuoPfqC2iaHjsN9LYmdTYw19RhmoSwcybu1b+L5Lx9ecAQWlHfF3j5lrGzRKxNxTwiw BYsKN5gXOtbA95x4HJcRiiT6N71sgZ080EnjXIkh5R1LvyzsoaxXjvXxZWgEBCOoBLTl+3BtuJhcy yyHJaNv6IVDRshoRFTSRca+H2pLmViXYGb6JugCSsXNkPh2JUr1CnQP+Q73ut+mXl6K8xXRLrPRnM nuNnvAkzz1Q+GnLR2lm6qAVWWARu6OzGVn5NX/3CuxgzIsLfYfW5knvWZKlIt60kEpN/E32Kf6VbE yYCo+mEw==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1sndJD-0005wv-Dd; Mon, 09 Sep 2024 14:15:55 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1sndJ5-00CETu-IU; Mon, 09 Sep 2024 14:15:47 +0200 Date: Mon, 9 Sep 2024 13:15:46 +0100 From: Steve George Message-ID: References: <6f955435210117be318754d224dab9dcb7af31cf.1725697758.git.steve@futurile.net> <874j6rp8gq.fsf@dismail.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <874j6rp8gq.fsf@dismail.de> 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: -7.02 X-Spam-Score: -7.02 X-Migadu-Queue-Id: B63D36C192 X-Migadu-Scanner: mx11.migadu.com X-TUID: BGnyCpME3x07 Hi, I've confused Mumi somehow, it's not that the patch is malformed. This works for applying: ## apply v2 by downloading it from Debbugs as Mumi gets confused guix shell --development guix mumi git git:send-email wget # base commit for v2 series from cover-letter git branch borgmatic-v2-tst5-apply f42427046b11029faaa69b7f10c77b45240e1111 git switch borgmatic-v2-tst5-apply # Dezyne commit from Janneke git log wget "https://debbugs.gnu.org/cgi/bugreport.cgi?mbox=yes;msg=32;bug=73038" -O python-apprise-v2.mbx wget "https://debbugs.gnu.org/cgi/bugreport.cgi?mbox=yes;msg=35;bug=73038" -O borgmatic-1.8.14-v2.mbx git am -s python-apprise-v2.mbx git am borgmatic-1.8.14-v2.mbx I seem to keep getting the python apprise patch when I try and download the borgmatic patch v2 patch from Guix Issues: wget "https://issues.guix.gnu.org/issue/73038/raw/6 Which maybe why the Mumi cli tool gets confused because it's processing the same patch twice. Pretty sure I messed it up by accidently sending the first patch with the incorrect email details and I've just confused th heck out of everything. Anyway, the above works to get the v2 patches and apply them. Thanks, Steve On 7 Sep, jgart wrote: > > hi, > > it looks like the patch does not apply. > > can you send a v3 after rebasing? > > $ mumi am v2 -- -s -S > Applying: gnu: python-apprise: Fix build. > Applying: gnu: python-apprise: Fix build. > error: patch failed: gnu/packages/python-xyz.scm:324 > error: gnu/packages/python-xyz.scm: patch does not apply > Patch failed at 0001 gnu: python-apprise: Fix build. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config advice.mergeConflict false" > Backtrace: > 2 (primitive-load "/gnu/store/bj3yzpfpmxxwxl02gr7lby212c5…") > In srfi/srfi-1.scm: > 634:9 1 (for-each # …) > In mumi/client.scm: > 249:12 0 (call-with-output-pipe* _ _ . _) > > mumi/client.scm:249:12: In procedure call-with-output-pipe*: > Command invocation failed failed ("git" "am" "-s" "-S") > > -- > mumi the world, > jgart