From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Wed, 03 Nov 2010 16:47:25 +0900 Message-ID: <87y69aj1bm.fsf@uwakimon.sk.tsukuba.ac.jp> 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> <87k4kuhpaf.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1288771218 26095 80.91.229.12 (3 Nov 2010 08:00:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 3 Nov 2010 08:00:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 03 09:00:13 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 1PDYGS-0003aj-JN for ged-emacs-devel@m.gmane.org; Wed, 03 Nov 2010 09:00:12 +0100 Original-Received: from localhost ([127.0.0.1]:42976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDYGR-0000Kx-US for ged-emacs-devel@m.gmane.org; Wed, 03 Nov 2010 04:00:11 -0400 Original-Received: from [140.186.70.92] (port=56143 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDYGD-0008Tn-Gw for emacs-devel@gnu.org; Wed, 03 Nov 2010 04:00:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDY2V-0004IK-I1 for emacs-devel@gnu.org; Wed, 03 Nov 2010 03:45:49 -0400 Original-Received: from imss12.cc.tsukuba.ac.jp ([130.158.254.161]:60925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDY2V-0004IE-8b for emacs-devel@gnu.org; Wed, 03 Nov 2010 03:45:47 -0400 Original-Received: from imss12.cc.tsukuba.ac.jp (imss12.cc.tsukuba.ac.jp [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id 469AB2AF543; Wed, 3 Nov 2010 16:45:46 +0900 (JST) Original-Received: from mgmt1.sk.tsukuba.ac.jp (unknown [130.158.97.223]) by imss12.cc.tsukuba.ac.jp (Postfix) with ESMTP id 383082AF542; Wed, 3 Nov 2010 16:45:46 +0900 (JST) Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt1.sk.tsukuba.ac.jp (Postfix) with ESMTP id 360813FA052E; Wed, 3 Nov 2010 16:45:46 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id EE5AD1A3EDD; Wed, 3 Nov 2010 16:47:25 +0900 (JST) In-Reply-To: <87k4kuhpaf.fsf@telefonica.net> X-Mailer: VM undefined under 21.5 (beta29) "garbanzo" ed3b274cc037 XEmacs Lucid (x86_64-unknown-linux) 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:132316 Archived-At: =D3scar Fuentes writes: > 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. No, from the point of view of history consistency they're the same. Cross-branch histories aren't "a little bit inconsistent"; they're consistent or they're not. In the first case you can depend on tools like Bazaar and git to DTRT, and in the latter you can't.