[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.
From: |
Eli Zaretskii |
Subject: |
Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522. |
Date: |
Wed, 01 Oct 2014 18:45:14 +0300 |
> Date: Wed, 1 Oct 2014 22:22:25 +0700
> From: Yuri Khan <address@hidden>
> Cc: "Stephen J. Turnbull" <address@hidden>, Stefan Monnier <address@hidden>,
> Emacs developers <address@hidden>
>
> * 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!