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: Strange response after merge from upstream Date: Wed, 02 Dec 2009 18:44:37 +0100 Message-ID: <87hbs946ey.fsf@telefonica.net> References: <833a3umrfx.fsf@gnu.org> <83skbuko4g.fsf@gnu.org> <87pr6xvr5r.fsf@uwakimon.sk.tsukuba.ac.jp> <87ljhl500o.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1259781676 21178 80.91.229.12 (2 Dec 2009 19:21:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 19:21:16 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 20:21:09 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 1NFul4-0008QH-BX for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 20:21:02 +0100 Original-Received: from localhost ([127.0.0.1]:32827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFul3-0003uv-Ue for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 14:21:01 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFtGU-0001si-DN for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:45:22 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFtGO-0001m0-SL for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:45:21 -0500 Original-Received: from [199.232.76.173] (port=41370 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFtGO-0001lq-Hy for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:45:16 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:56756) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFtGO-0000bS-30 for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:45:16 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NFtGK-00036w-MK for emacs-devel@gnu.org; Wed, 02 Dec 2009 18:45:12 +0100 Original-Received: from 112.red-83-38-73.dynamicip.rima-tde.net ([83.38.73.112]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 02 Dec 2009 18:45:12 +0100 Original-Received: from ofv by 112.red-83-38-73.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 02 Dec 2009 18:45:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 18 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 112.red-83-38-73.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:YEknp/Q8eNWAit9TlPn2RfKJrSk= X-detected-operating-system: by monty-python.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:118144 Archived-At: Stefan Monnier writes: >> `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'. -- Óscar