all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: zimoun <zimon.toutoune@gmail.com>
To: Florian <florhizome@posteo.net>, 60013@debbugs.gnu.org
Subject: [bug#60013] [PATCH 1/3] gnu: Add libmodule
Date: Thu, 15 Dec 2022 12:31:11 +0100	[thread overview]
Message-ID: <86pmckdhts.fsf@gmail.com> (raw)
In-Reply-To: <87tu1zr072.fsf@posteo.net>

Hi Florian,

On Tue, 13 Dec 2022 at 11:51, Florian <florhizome@posteo.net> wrote:

> These also would be those "prerequisite-patch-ids" hanging around, that
> are generated by the --base=auto flag I use with git send-email like a
> good manual follower. I don't want to operate on multiple guix repos or branches, I find
> the workflow to keep one updated time-consuming enough so far... So I
> guess, to be frank, what can I actually do about that?

I understand.  My point is just that it can be hard to be sure that the
patch set correctly applies; because some prerequisite-patch-ids could
modifies something without being included.  For instance, I think it is
what is happening with this current patch set.  On the top of,

    base-commit: 0ce1f82e5aaac951b21d579eb46bf75cfe6713c0

from the master branch, PATCH 1/3 correctly applies but I am failing to
apply PATCH 2/3.

--8<---------------cut here---------------start------------->8---
error: patch failed: gnu/packages/wm.scm:102
error: gnu/packages/wm.scm: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: gnu: Add clightd
Patch failed at 0001 gnu: Add clightd
--8<---------------cut here---------------end--------------->8---

Well, I understand your workflow, I guess.  My point is just to mention
that creating a branch with Git costs nothing.  For instance,

--8<---------------cut here---------------start------------->8---
git checkout -d example
git reset --soft 0ce1f82e5aaac951b21d579eb46bf75cfe6713c0
git cherry-pick 5ad571d5a145a7a33ec9241bf75f25cf4864e629
git format-patch -1 --cover-letter --base=0ce1f82e5aaac951b21d579eb46bf75cfe6713c0
git checkout master
git branch -D example
--8<---------------cut here---------------end--------------->8---

where 0ce1f82e5aaac951b21d579eb46bf75cfe6713c0 is ’origin/master’ when
you created this patch set.  And where
5ad571d5a145a7a33ec9241bf75f25cf4864e629 is the commit adding libmodule.

From my point of view, it changes almost nothing for you and, IMHO, it
helps the review, both the human and the automated [1] ones.

Obviously, it is an opinionated minor comment. :-) And for sure, the
most important is that you send your contributions–meaning, the way that
is comfortable for you.

1: https://qa.guix.gnu.org/issue/60013

Cheers,
simon




  reply	other threads:[~2022-12-15 11:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-12 16:53 [bug#60013] [PATCH] gnu: Add clight Florian
2022-12-12 19:16 ` zimoun
2022-12-12 20:51   ` Tobias Geerinckx-Rice via Guix-patches via
2022-12-12 20:31 ` [bug#60013] [PATCH 1/3] gnu: Add libmodule florhizome
2022-12-12 20:31   ` [bug#60013] [PATCH 2/3] gnu: Add clightd florhizome
2022-12-12 21:53     ` ( via Guix-patches via
2022-12-12 20:31   ` [bug#60013] [PATCH 3/3] gnu: Add clight florhizome
2022-12-12 21:57     ` ( via Guix-patches via
2022-12-12 21:00   ` [bug#60013] [PATCH 1/3] gnu: Add libmodule ( via Guix-patches via
2022-12-12 23:48   ` zimoun
2022-12-13 11:51     ` Florian
2022-12-15 11:31       ` zimoun [this message]
2022-12-20 16:33         ` Florian
2022-12-21 11:22           ` ( via Guix-patches via
2022-12-30 12:45           ` zimoun

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=86pmckdhts.fsf@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=60013@debbugs.gnu.org \
    --cc=florhizome@posteo.net \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.