From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522. Date: Wed, 01 Oct 2014 17:44:20 +0300 Message-ID: <83tx3nkfy3.fsf@gnu.org> References: <23194.1412094213@olgas.newt.com> <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1412174701 20388 80.91.229.3 (1 Oct 2014 14:45:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Oct 2014 14:45:01 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 01 16:44:51 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XZL99-0005vq-0E for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 16:44:51 +0200 Original-Received: from localhost ([::1]:55795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZL98-0001e6-Mj for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 10:44:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZL8o-0001WW-GD for emacs-devel@gnu.org; Wed, 01 Oct 2014 10:44:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZL8j-00088F-9L for emacs-devel@gnu.org; Wed, 01 Oct 2014 10:44:30 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:50823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZL8j-000881-0n for emacs-devel@gnu.org; Wed, 01 Oct 2014 10:44:25 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NCR00000SE8MP00@mtaout27.012.net.il> for emacs-devel@gnu.org; Wed, 01 Oct 2014 17:38:59 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NCR00JI1SOZCR70@mtaout27.012.net.il>; Wed, 01 Oct 2014 17:38:59 +0300 (IDT) In-reply-to: <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:174910 Archived-At: > From: "Stephen J. Turnbull" > 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.