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: Incorrect merge Date: Tue, 02 Nov 2010 20:38:53 +0200 Message-ID: <837hgv605e.fsf@gnu.org> References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> <87d3qnk9am.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1288723149 7009 80.91.229.12 (2 Nov 2010 18:39:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 18:39:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 19:39:04 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PDLl9-0002le-6V for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 19:39:03 +0100 Original-Received: from localhost ([127.0.0.1]:47662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDLl8-0003OW-8p for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 14:39:02 -0400 Original-Received: from [140.186.70.92] (port=48215 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDLl2-0003OP-8E for emacs-devel@gnu.org; Tue, 02 Nov 2010 14:38:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDLl0-0002ZL-MK for emacs-devel@gnu.org; Tue, 02 Nov 2010 14:38:56 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:45715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDLl0-0002Z6-EM for emacs-devel@gnu.org; Tue, 02 Nov 2010 14:38:54 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LB900I00SWI9X00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Tue, 02 Nov 2010 20:38:52 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.124.98.164]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LB900H54T4R59C0@a-mtaout22.012.net.il>; Tue, 02 Nov 2010 20:38:52 +0200 (IST) In-reply-to: <87d3qnk9am.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132294 Archived-At: > From: =C3=93scar Fuentes > Date: Tue, 02 Nov 2010 16:57:37 +0100 >=20 > BTW, do you realize that the script would end cherry-picking commit= s Can't it instead do a merge and then reverse cherry-pick the revision= s that should not be merged?