From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522. Date: Wed, 1 Oct 2014 22:22:25 +0700 Message-ID: References: <23194.1412094213@olgas.newt.com> <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp> <83tx3nkfy3.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1412176961 20104 80.91.229.3 (1 Oct 2014 15:22:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Oct 2014 15:22:41 +0000 (UTC) Cc: "Stephen J. Turnbull" , Stefan Monnier , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 01 17:22:34 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 1XZLjc-0007DU-Ji for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 17:22:32 +0200 Original-Received: from localhost ([::1]:56055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZLjb-0006So-W0 for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 11:22:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZLjZ-0006Sa-EX for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:22:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZLjY-0004f6-M0 for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:22:29 -0400 Original-Received: from mail-ig0-x22e.google.com ([2607:f8b0:4001:c05::22e]:38832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZLjX-0004ef-3w; Wed, 01 Oct 2014 11:22:27 -0400 Original-Received: by mail-ig0-f174.google.com with SMTP id l13so465647iga.1 for ; Wed, 01 Oct 2014 08:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=zB6A0nytZl81V1qF+IJIdYdkApbmXZTwyrIuGsFvtNc=; b=dPDLjc0Xrr3Y4vMEWd5rIPIe7UeU1Qt18BaIUpKlMpQz+CU9I0kMQYAbGEKNYaiuby xipI/kuLwXW5z1MADqA5178Q436DeD3VIhL20LvGN1/MOycukoUrKGA7sS0zoZg0XdOU VHrnWqcvNT2yR7hShd1Wk8A33IxlGMMAtOHmd8VIAsj6xabiwJmtz5JAb2AXrKrvqL9P GglElkb7RwlQYoaN9qjMLkDSOIvA8x6t2Wl8UPi8QpC3uNGzAj3nEPfjZAA+6B+LzuD5 JED5ZVafF3a9qgSFPATUmQA5q15XjfQuguq32OODVKgBRSpJnFIFLR7T92lH3di6t6RW ic+w== X-Received: by 10.42.208.143 with SMTP id gc15mr22615308icb.91.1412176945392; Wed, 01 Oct 2014 08:22:25 -0700 (PDT) Original-Received: by 10.107.4.79 with HTTP; Wed, 1 Oct 2014 08:22:25 -0700 (PDT) In-Reply-To: <83tx3nkfy3.fsf@gnu.org> X-Google-Sender-Auth: ec3wgNMf6XjmrOXIj83SDSQc1R0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::22e 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:174911 Archived-At: On Wed, Oct 1, 2014 at 9:44 PM, Eli Zaretskii wrote: > 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. * 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