From: Eli Zaretskii <eliz@gnu.org>
To: "Stephen J. Turnbull" <stephen@xemacs.org>
Cc: 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 17:44:20 +0300 [thread overview]
Message-ID: <83tx3nkfy3.fsf@gnu.org> (raw)
In-Reply-To: <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp>
> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Date: Wed, 01 Oct 2014 11:52:58 +0900
> Cc: emacs-devel@gnu.org
>
> 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.
next prev parent reply other threads:[~2014-10-01 14: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 [this message]
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
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=83tx3nkfy3.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--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).