From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: "Stephen J. Turnbull" <stephen@xemacs.org>, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.
Date: Wed, 01 Oct 2014 13:44:32 -0400 [thread overview]
Message-ID: <jwv61g3y9qd.fsf-monnier+emacsdiffs@gnu.org> (raw)
In-Reply-To: <83tx3nkfy3.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 01 Oct 2014 17:44:20 +0300")
> It strikes me that the VCS could merge all the commits up to the one I
> want to cherry-pick, and then revert all the rest. But I guess there
> are complications with this strategy, or else it would have been
> implemented already.
The problem is not only how to perform the merge, but how to *remember* it.
I.e. so that next time you merge from emacs-24, it will know that it
needs to merge all the changes except for the ones that were already
cherry-picked.
BTW, It gets interesting pretty quickly:
- Say I have a local branch `Stef'.
- `Stef' generally tracks `trunk'.
- I cherry-pick into `Stef' revision 57 and 93 from `emacs-24'.
- Someone merges `emacs-24' into `trunk'. I.e. commit 187 from `trunk'
is a "merge commit" that merges all changes from `emacs-24' upto
revision 98.
- Now I want to update `Stef' by merging the latest `trunk' (which is
now at revision 192) into it. Should commit 187 be merged as well?
The answer is "yes but no":
- yes, because it brings changes from `emacs-24' which we don't yet have.
- no, because it would bring changes from `emacs-24' which we already applied.
So it could try to "take revision 192, try to reverse the changes from
revisions 57 and 93" and then apply the result to `Stef', but as you
can see.
Stefan
prev parent reply other threads:[~2014-10-01 17:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1XYpeB-0002D6-5f@vcs.savannah.gnu.org>
2014-09-30 15:56 ` [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522 Stefan Monnier
2014-09-30 16:23 ` Bill Wohler
2014-09-30 16:53 ` Eli Zaretskii
2014-09-30 18:04 ` Stefan Monnier
2014-10-01 2:52 ` Stephen J. Turnbull
2014-10-01 14:44 ` Eli Zaretskii
2014-10-01 15:22 ` Yuri Khan
2014-10-01 15:45 ` Eli Zaretskii
2014-10-01 15:49 ` Eli Zaretskii
2014-10-02 1:48 ` Stephen J. Turnbull
2014-10-01 17:44 ` Stefan Monnier [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=jwv61g3y9qd.fsf-monnier+emacsdiffs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=stephen@xemacs.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).