From: Eli Zaretskii <eliz@gnu.org>
To: Yuri Khan <yuri.v.khan@gmail.com>
Cc: stephen@xemacs.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.
Date: Wed, 01 Oct 2014 18:45:14 +0300 [thread overview]
Message-ID: <83lhozkd4l.fsf@gnu.org> (raw)
In-Reply-To: <CAP_d_8V7wHTPBJ_qMSEFjQz960iwryBsjjpdd8Q3a2YGSLrmDQ@mail.gmail.com>
> Date: Wed, 1 Oct 2014 22:22:25 +0700
> From: Yuri Khan <yuri.v.khan@gmail.com>
> Cc: "Stephen J. Turnbull" <stephen@xemacs.org>, Stefan Monnier <monnier@iro.umontreal.ca>,
> Emacs developers <emacs-devel@gnu.org>
>
> * A revert is the same thing as a cherry-pick, just with an opposite
> sign. Would you really want to fix a missing link of a cherry-picked
> commit to its original by introducing a few thousand reverts, all with
> missing links to the original commits they revert?
>
> * Imagine a mergy graph on the branch being cherry-picked from. How do
> you revert that mergy clump? What if there are merges from that into
> the current branch?
>
> ---o---o---o---o---o---o A
> \ /
> o---o---o---o B
> \ /
> o---o
Well, figure it out, and you get my thumbs-up!
next prev parent reply other threads:[~2014-10-01 15:45 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 [this message]
2014-10-01 15:49 ` Eli Zaretskii
2014-10-02 1:48 ` Stephen J. Turnbull
2014-10-01 17:44 ` Stefan Monnier
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=83lhozkd4l.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=stephen@xemacs.org \
--cc=yuri.v.khan@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 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).