unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Harald Jörg" <haj@posteo.de>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Emacs Developer List <emacs-devel@gnu.org>
Subject: Re: How to "backport" a patch from master to emacs-28?
Date: Thu, 20 Oct 2022 19:41:33 +0000	[thread overview]
Message-ID: <87tu3yp9jm.fsf@vdesktop> (raw)
In-Reply-To: <jwvpmem9xjg.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Thu, 20 Oct 2022 14:14:00 -0400")

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> I understand that the usual procedure is to merge _from_ the release
>> branches _to_ master, but that ship has sailed.  Is it ok to cherry-pick
>> the single commit and push it to emacs-28?  It is a trivial patch,
>> below is what "git show" has to say.
>
> Yes, that can be done, indeed.  But please mark it as a "backport".
> Or use `git cherry-pick` which should label it similarly.  This should
> make sure that the next time we merge from emacs-28 back to `master`,
> `gitmerge.el` can automatically skip it to avoid spurious conflicts.

Thanks for the recipe! I've done this now.
-- 
Cheers,
haj



      reply	other threads:[~2022-10-20 19:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-20 17:54 How to "backport" a patch from master to emacs-28? Harald Jörg
2022-10-20 18:14 ` Stefan Monnier
2022-10-20 19:41   ` Harald Jörg [this message]

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://www.gnu.org/software/emacs/

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

  git send-email \
    --in-reply-to=87tu3yp9jm.fsf@vdesktop \
    --to=haj@posteo.de \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /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/emacs.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).