From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Strange response after merge from upstream Date: Wed, 02 Dec 2009 14:37:12 -0500 Message-ID: References: <833a3umrfx.fsf@gnu.org> <83skbuko4g.fsf@gnu.org> <87pr6xvr5r.fsf@uwakimon.sk.tsukuba.ac.jp> <87ljhl500o.fsf@telefonica.net> <87hbs946ey.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259792177 24476 80.91.229.12 (2 Dec 2009 22:16:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 22:16:17 +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 Dec 02 23:16:11 2009 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.50) id 1NFxUU-0002Kx-AG for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 23:16:06 +0100 Original-Received: from localhost ([127.0.0.1]:59922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFxUT-0002o5-U3 for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 17:16:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFv0r-00039q-EL for emacs-devel@gnu.org; Wed, 02 Dec 2009 14:37:21 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFv0m-00035C-Pf for emacs-devel@gnu.org; Wed, 02 Dec 2009 14:37:20 -0500 Original-Received: from [199.232.76.173] (port=52727 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFv0m-000355-GG for emacs-devel@gnu.org; Wed, 02 Dec 2009 14:37:16 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:27198 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFv0m-0004WE-A7 for emacs-devel@gnu.org; Wed, 02 Dec 2009 14:37:16 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsAEACJRFktLd/5a/2dsb2JhbACBTtYKhDEEihc X-IronPort-AV: E=Sophos;i="4.47,330,1257138000"; d="scan'208";a="50524186" Original-Received: from 75-119-254-90.dsl.teksavvy.com (HELO pastel.home) ([75.119.254.90]) by ironport2-out.pppoe.ca with ESMTP; 02 Dec 2009 14:37:12 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 249ED86C4; Wed, 2 Dec 2009 14:37:12 -0500 (EST) In-Reply-To: <87hbs946ey.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Wed, 02 Dec 2009 18:44:37 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:118154 Archived-At: >>> `pull' never merges because there is nothing that can cause conflicts. >> >> Oh, so that's the misconception from which comes the stupid idea >> that --show-base would only apply to merge but not to pull? >> >> FYI, this is not true: it has to merge the incoming patches with the >> local uncommitted changes. > Yes, IMO that feature is so wrong that I forgot about it. > By default, `pull' should refuse to operate if there are local edited > files. If you often work on that scenario, you'll better use a bound > branch and `update' instead of `pull'. Yes, well, that's indeed my situation, and my branch is bound and I use `update', tho I also use `pull' because it makes no difference. The problem is still the same: it doesn't take a --show-base argument. Stefan