From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OB85ELx2DWX4JwAAauVa8A:P1 (envelope-from ) for ; Fri, 22 Sep 2023 13:13:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OB85ELx2DWX4JwAAauVa8A (envelope-from ) for ; Fri, 22 Sep 2023 13:13:00 +0200 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 ECE70C73F for ; Fri, 22 Sep 2023 13:12:59 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=izCNOwnj; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695381180; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=X1Gvm8YL5F/wvip8ANeeKcdVoNYnJ+niamUsVnVaf1w=; b=q+s3r3zSfC3zSdd721Walf5C+6Rvm7arc8hYLz2gcojBvsoflr3PH0vXQQidDymbtx4oh+ XzaOeE9GF6HPfYiuKUKNtCzXIRux3t1ByZKu4G+lGsu0UD2GGdEdT+3pktHteWKEbKIhAi r9sglr+39i5jOVEK1EPW8q+QnFMH8zdZ/DE8C/fMcnJtsUx3ijStqnrWXn9G9T694ImjXj POC0TwMEvz2PhK/MYoRjZl41CN9GlmC/gv6t2K/b26L8VtFi9B7YJIWIzHqhZV2pb0vVBB 1Db2axiB3nKtiW5yMYoV7TtCoksogR3SLclTReBPV7Oqk/Q2V7Q2QpAm2j9tlQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695381180; a=rsa-sha256; cv=none; b=VeCoyl6jdg3m1kwESB1okX81oePVOuUmAb6bzt/wyogxaJaI8Q807Iou8FFE4cjNhBfysT hrrtHe/F3WleerzUK4PVV/hzhgntGi269qjds33wyTfjTNbcQjRPJ8ZZmtV2RTxV9ty2L+ V/wzx8XxV4FSWjc8rabCJ+uEwFVyQfVnny/sc8CmAFVQXxad2SyKG06PALRLaqleDTDbRd ixnrRtyWS41UnrVOsG+pvtsYDfEvQJSJVeXD07sCfCOROsREtL/Q5OB5+javH/vCeY908f sI7fCQWrh8dfAy9V25a/wHkd5WB2NKq39nRNKS+nWxbv+YZgVKf6cJn1Nxx54Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=izCNOwnj; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qje57-00060w-9Y; Fri, 22 Sep 2023 07:12:23 -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 1qje55-00060T-0b for guix-devel@gnu.org; Fri, 22 Sep 2023 07:12:19 -0400 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qje53-0001XW-4M for guix-devel@gnu.org; Fri, 22 Sep 2023 07:12:18 -0400 Received: by mail-lf1-x143.google.com with SMTP id 2adb3069b0e04-503f39d3236so3340120e87.0 for ; Fri, 22 Sep 2023 04:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695381134; x=1695985934; darn=gnu.org; h=content-transfer-encoding:subject:to:from:content-language :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=X1Gvm8YL5F/wvip8ANeeKcdVoNYnJ+niamUsVnVaf1w=; b=izCNOwnjJkjZjVMHARPrzEP8yCV5uurXHlL6RGWhTSxIrQuNWAbvpG2iELVRAmtP6I ZHd+Qps8PnlcTTcf80PeTvCsTOS+Num1BGmeKv2QSWHwM6G7y7Uy0YBOV/rMfBDuKVpf DssZ01ZQmih3Lue02CI8wEX4RsnwlYPrMRgl5NG6H2SJZRIQ251LxYD70ss1NbB7hU/+ am7e1wnMm9Faw93EU2UsMwfbutIfrdMWt/P+BK3dH+ZtonzUwtMcEQTupBkFgdH1HXPb EbivUvOtMWFHQ2xEuH57FwlTam5Hi5U7ht8Fi20jPGl/uXxvuxzEt4qcgD+UPqLNI/9N LWIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695381134; x=1695985934; h=content-transfer-encoding:subject:to:from:content-language :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=X1Gvm8YL5F/wvip8ANeeKcdVoNYnJ+niamUsVnVaf1w=; b=vtT6GoVzjmAdaxVefYbyrUVayD1Mi2TcRwRE4YXoKGPbrvH540229u94N0l/8t5QAO zlJbANFH3P2SPI5P9b8Br2XrenhPBLFzE/iyTqPxFXGgv4kUG24OUlyr/yiYy6hft3Bh OAkWcmsGY28eFuzVxnJoY6CcOaYvfO+B+Z+5bBW3ZaMs15oMWnLKledunf/NgMcXuloe 6UzNLLlJ3zRIyuqQ9RPbp7ho5Obg1eY5abfwwD0DEM76wCLJ+QmBQ5N5xPxiGrvo77Qz bgwTqROb6OvBfL1krPtNJPJsuh8X4jB61YNEaKTSOzPBmbWTDdPyXb1LyQrv8mlnphqu JHQA== X-Gm-Message-State: AOJu0YyhfS/dGZDD7UKVFLyqPztVUf2Cw9PvSM9ZvOMDRKek7aM3kxfk IWsatOSm+FRLuicnrytHiOfBv7guC3AWtw== X-Google-Smtp-Source: AGHT+IF8remhlFfZ2zZFOE3Q7Sy/dcLvJDJeQdqBfCwk0iv/EG25yB1eQJnTdU694/oRM+raK1u5Pw== X-Received: by 2002:ac2:5f73:0:b0:503:3827:bfa9 with SMTP id c19-20020ac25f73000000b005033827bfa9mr6230372lfc.34.1695381133638; Fri, 22 Sep 2023 04:12:13 -0700 (PDT) Received: from [127.0.0.1] ([188.68.129.52]) by smtp.gmail.com with ESMTPSA id q15-20020a19a40f000000b004fdd9d43e05sm686308lfc.171.2023.09.22.04.12.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Sep 2023 04:12:13 -0700 (PDT) Message-ID: <1178f7a1-0ab2-6955-5138-248a6f272c33@gmail.com> Date: Fri, 22 Sep 2023 16:12:12 +0500 MIME-Version: 1.0 Content-Language: en-US From: nigko To: guix-devel@gnu.org Subject: Stuck patch 64345 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2a00:1450:4864:20::143; envelope-from=nigko.yerden@gmail.com; helo=mail-lf1-x143.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -9.58 X-Spam-Score: -9.58 X-Migadu-Queue-Id: ECE70C73F X-TUID: nJvyXH4/L+B0 Hello Guix! Almost three months ago I sent a patch https://issues.guix.gnu.org/64345 introducing a package reduce-csl, a computer algebra system Reduce similar to Maxima. It was successfully built on major architectures and acquired a 'green' status, waiting for a review. But then some dramatic changes happened on https://qa.guix.gnu.org/ and my patch went to a 'gray' zone. Recently a massage with the content -------------------------------------------------------- Unable to apply patches Applying: gnu: Add reduce-csl. Using index info to reconstruct a base tree... M gnu/packages/maths.scm Falling back to patching base and 3-way merge... Auto-merging gnu/packages/maths.scm CONFLICT (content): Merge conflict in gnu/packages/maths.scm error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 gnu: Add reduce-csl. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -------------------------------------------------------- has appeared on https://qa.guix.gnu.org/issue/64345 As far as I understand the reason for this behavior is that since I sent the patch the content of the gnu/packages/maths.scm was modified by another patch(es) and now git is unable to apply my old patch onto new commits automatically. What am I supposed to do to promote my stuck patch? Should I resend it anew? Regards, N Y