From: Glenn Morris <rgm@gnu.org>
To: emacs-devel@gnu.org
Subject: Procedure for reverting commits on release branch
Date: Sun, 03 May 2020 13:20:09 -0400 [thread overview]
Message-ID: <ho368hlyuu.fsf@fencepost.gnu.org> (raw)
If a commit is made on the release branch, and then one wants to instead
have it only on master, then given the following commit sequence:
1) emacs-27: do something
2) emacs-27: revert something
3) master: do something
If gitmerge.el is now used to merge emacs-27 to master:
commit 1) is skipped, because it is already on master
commit 2) is merged
Net result: 3) is reverted on master and has to be applied again by hand.
Specific recent example: lisp/calculator.el
A more efficient way to do this would be:
1) emacs-27: do something
2) emacs-27: revert something, and mark "do not merge to master"
Then no special handling is needed.
next reply other threads:[~2020-05-03 17:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-03 17:20 Glenn Morris [this message]
2020-05-03 17:36 ` Procedure for reverting commits on release branch Eli Zaretskii
2021-01-04 17:06 ` Glenn Morris
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=ho368hlyuu.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-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/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).