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 18:45:14 +0300 Message-ID: <83lhozkd4l.fsf@gnu.org> References: <23194.1412094213@olgas.newt.com> <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp> <83tx3nkfy3.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1412178339 8575 80.91.229.3 (1 Oct 2014 15:45:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Oct 2014 15:45:39 +0000 (UTC) Cc: stephen@xemacs.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 01 17:45:32 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 1XZM5s-0000k5-04 for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 17:45:32 +0200 Original-Received: from localhost ([::1]:56171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZM5r-0005HT-Ll for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 11:45:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZM5j-0005G7-Te for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:45:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZM5f-0006cY-3v for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:45:23 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:34280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZM5e-0006bs-Sf for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:45:19 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NCR00I00VJR1B00@mtaout26.012.net.il> for emacs-devel@gnu.org; Wed, 01 Oct 2014 18:43:24 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NCR007TUVOCD8A0@mtaout26.012.net.il>; Wed, 01 Oct 2014 18:43:24 +0300 (IDT) In-reply-to: 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.182 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:174912 Archived-At: > Date: Wed, 1 Oct 2014 22:22:25 +0700 > From: Yuri Khan > Cc: "Stephen J. Turnbull" , Stefan Monnier , > Emacs developers > > * 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!