From: John Wiegley <jwiegley@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: larsi@gnus.org, dak@gnu.org, emacs-devel@gnu.org
Subject: Re: EWW bugs should be fixed on emacs-25 branch
Date: Fri, 25 Dec 2015 09:23:44 -0800 [thread overview]
Message-ID: <m2bn9emoh1.fsf@newartisans.com> (raw)
In-Reply-To: <83d1tulaa1.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 25 Dec 2015 19:15:34 +0200")
>>>>> Eli Zaretskii <eliz@gnu.org> writes:
>> In general, Git handles "not duplicating work you've cherry-picked into a
>> branch" quite well.
> AFAIK, Git doesn't track cherry-picks in the DAG.
What it does track are "patch ids", that is, the SHA of the diff represented
by a given commit against its parent:
https://www.kernel.org/pub/software/scm/git/docs/git-patch-id.html
This allows the merging algorithm to know whether it's attempting to bring in
a change that has already been seen on the target branch.
"git cherry can compare a branch with its upstream branch and find which
commits have been upstreamed and which haven’t. This command is particularly
clever because, thanks to git patch-id, it can correctly spot when a commit
has been upstreamed, even when the upstreaming process resulted in changes
to the commit message, line numbers, or whitespace."
(from http://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/)
So the theory is, you _should_ be able to cherry pick commits from one branch
to another, and then act as though it never happened with respect to merging.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
next prev parent reply other threads:[~2015-12-25 17:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-25 7:52 EWW bugs should be fixed on emacs-25 branch Eli Zaretskii
2015-12-25 8:06 ` Eli Zaretskii
2015-12-25 8:26 ` David Kastrup
2015-12-25 14:18 ` Eli Zaretskii
2015-12-25 16:58 ` John Wiegley
2015-12-25 17:15 ` Eli Zaretskii
2015-12-25 17:23 ` John Wiegley [this message]
2015-12-25 19:41 ` Eli Zaretskii
2015-12-25 19:55 ` John Wiegley
2015-12-25 20:00 ` Eli Zaretskii
2015-12-25 20:09 ` John Wiegley
2015-12-25 20:40 ` Eli Zaretskii
2015-12-25 20:44 ` John Wiegley
2015-12-25 20:48 ` Eli Zaretskii
2015-12-25 20:53 ` John Wiegley
2015-12-25 23:18 ` David Engster
2015-12-25 23:35 ` Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) John Wiegley
2015-12-25 23:40 ` Having a custom merge process Lars Ingebrigtsen
2015-12-25 23:59 ` David Engster
2015-12-26 0:47 ` John Wiegley
2015-12-26 7:35 ` Paul Eggert
2015-12-26 9:47 ` Eli Zaretskii
2015-12-26 9:44 ` Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) Eli Zaretskii
2015-12-26 17:00 ` EWW To Elpa? Re: Having a custom merge process raman
2015-12-26 17:51 ` Lars Ingebrigtsen
2015-12-26 21:06 ` Artur Malabarba
2015-12-28 21:17 ` John Wiegley
2015-12-26 18:40 ` Artur Malabarba
2015-12-27 16:29 ` raman
2015-12-27 2:52 ` Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) Richard Stallman
2015-12-27 3:49 ` Eli Zaretskii
2015-12-25 16:07 ` EWW bugs should be fixed on emacs-25 branch Lars Ingebrigtsen
2015-12-25 16:21 ` Eli Zaretskii
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=m2bn9emoh1.fsf@newartisans.com \
--to=jwiegley@gmail.com \
--cc=dak@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.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.