From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Wed, 03 Nov 2010 07:52:40 +0100 Message-ID: <87k4kuhpaf.fsf@telefonica.net> 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> <87k4kvwu6w.fsf@uwakimon.sk.tsukuba.ac.jp> <8762wfk5r0.fsf@telefonica.net> <87eib3wp4j.fsf@uwakimon.sk.tsukuba.ac.jp> <87fwvjimg2.fsf@telefonica.net> <87d3qnwk0v.fsf@uwakimon.sk.tsukuba.ac.jp> <87wrovh2vl.fsf@telefonica.net> <871v73c775.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288767206 11615 80.91.229.12 (3 Nov 2010 06:53:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 3 Nov 2010 06:53:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 03 07:53:23 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 1PDXDX-0002yU-56 for ged-emacs-devel@m.gmane.org; Wed, 03 Nov 2010 07:53:22 +0100 Original-Received: from localhost ([127.0.0.1]:44133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDXDR-00044l-1g for ged-emacs-devel@m.gmane.org; Wed, 03 Nov 2010 02:53:01 -0400 Original-Received: from [140.186.70.92] (port=45148 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDXDL-000442-O5 for emacs-devel@gnu.org; Wed, 03 Nov 2010 02:52:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDXDK-0004gx-Aa for emacs-devel@gnu.org; Wed, 03 Nov 2010 02:52:55 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:34094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDXDK-0004gh-3c for emacs-devel@gnu.org; Wed, 03 Nov 2010 02:52:54 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PDXDH-0002t7-HJ for emacs-devel@gnu.org; Wed, 03 Nov 2010 07:52:51 +0100 Original-Received: from 83.42.13.98 ([83.42.13.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Nov 2010 07:52:51 +0100 Original-Received: from ofv by 83.42.13.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Nov 2010 07:52:51 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 15 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:M2WdbP2VtDGehTr4sCxVqHNtoCY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:132314 Archived-At: "Stephen J. Turnbull" writes: > > > And what if you fix a bug in trunk, and only later realize it needs to > > > be backported? > > > > And how is this different from the current workflow? > > It's not. That's precisely my point. You can reduce cherry-picking, > but not eliminate it. One thing is to resort to cherry-picking when some exceptional condition is detected, and another thing is to use cherry-picking as a tool for an ordinary task. [snip]