Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Date: Wed, 01 Oct 2014 11:52:58 +0900
> Cc: address@hidden
> 
> Stefan Monnier writes:
> 
>  > Sadly, the only DVCS which knew how to keep track of partial (aka
>  > cherry-picked) merges were DaRCS and Arch, AFAIK.
> 
> But in those DVCSes you lose the DAG, and gain exponential behavior
> for your trouble.  (Speaking of Darcs in the past tense isn't very
> accurate, either, although at the moment they're in maintenance mode.)
> 
> Tom Lord's revc (aka Arch v3) was showing theoretical promise in this
> direction: he based object storage (Arch's revision archive) on git's,
> but also was able to manipulate changes (revid pairs).  I'm not sure
> if he planned to add token replacement and similar Darcs-y features.

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.