From: nigko <nigko.yerden@gmail.com>
To: guix-devel@gnu.org
Subject: Stuck patch 64345
Date: Fri, 22 Sep 2023 16:12:12 +0500 [thread overview]
Message-ID: <1178f7a1-0ab2-6955-5138-248a6f272c33@gmail.com> (raw)
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
next reply other threads:[~2023-09-22 11:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 11:12 nigko [this message]
2023-09-22 18:03 ` Stuck patch 64345 Felix Lechner via Development of GNU Guix and the GNU System distribution.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1178f7a1-0ab2-6955-5138-248a6f272c33@gmail.com \
--to=nigko.yerden@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).