From: Leo Famulari <leo@famulari.name>
To: zimoun <zimon.toutoune@gmail.com>
Cc: guix-devel@gnu.org
Subject: Re: Generate diff with git-diff and use in patches field of packages
Date: Wed, 10 Mar 2021 13:06:30 -0500 [thread overview]
Message-ID: <YEkKpqrZsVFDCjsD@jasmine.lan> (raw)
In-Reply-To: <86a6radhla.fsf@gmail.com>
On Wed, Mar 10, 2021 at 06:49:37PM +0100, zimoun wrote:
> I could miss something but I was not suggesting to cherry-pick. :-)
> Cherry-picking means use the current packaged version and backport to it
> the commit(s) fixing the issue.
I know you were not suggesting to cherry-pick. But that is what this
thread is about: the best workflow for cherry-picking patches.
> I am suggesting to update the packaged version to the upstream version
> at commit. But maybe it is not possible because the new upstream has
> changed some API or whatever breaking some dependants.
We can do that, and sometimes we do. I think we should avoid it when
possible, since it's rare that upstream projects intend for us to
distribute their development branches.
next prev parent reply other threads:[~2021-03-10 18:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 3:11 Generate diff with git-diff and use in patches field of packages Léo Le Bouter
2021-03-10 13:42 ` zimoun
2021-03-10 17:09 ` Leo Famulari
2021-03-10 17:49 ` zimoun
2021-03-10 18:06 ` Leo Famulari [this message]
2021-03-10 18:42 ` zimoun
2021-03-10 17:09 ` Leo Famulari
2021-03-10 17:55 ` 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=YEkKpqrZsVFDCjsD@jasmine.lan \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
--cc=zimon.toutoune@gmail.com \
/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.