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:49:13 +0300 Message-ID: <83k34jkcxy.fsf@gnu.org> References: <23194.1412094213@olgas.newt.com> <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp> <83tx3nkfy3.fsf@gnu.org> <83lhozkd4l.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1412178579 12225 80.91.229.3 (1 Oct 2014 15:49:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Oct 2014 15:49:39 +0000 (UTC) Cc: stephen@xemacs.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: yuri.v.khan@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 01 17:49:33 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 1XZM9l-0002eq-2D for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 17:49:33 +0200 Original-Received: from localhost ([::1]:56213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZM9k-0008LZ-O4 for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 11:49:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZM9c-0008KV-OJ for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:49:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZM9V-0000SD-Vz for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:49:24 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:57745) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZM9V-0000RV-OW for emacs-devel@gnu.org; Wed, 01 Oct 2014 11:49:17 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NCR00600VU9ZI00@mtaout28.012.net.il> for emacs-devel@gnu.org; Wed, 01 Oct 2014 18:48:04 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NCR00LQ0VW42IA0@mtaout28.012.net.il>; Wed, 01 Oct 2014 18:48:04 +0300 (IDT) In-reply-to: <83lhozkd4l.fsf@gnu.org> 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.184 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:174913 Archived-At: > Date: Wed, 01 Oct 2014 18:45:14 +0300 > From: Eli Zaretskii > Cc: stephen@xemacs.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org > > > * 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! Btw, it's a bit ironic that while there's a lot of pressure to rebase branches instead of merging them, when these issues are discussed, suddenly all kind of complex DAGs pop up all over the place. If rebasing is the word of the day, then you will almost never see such DAGs.