From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alexander Belchenko Newsgroups: gmane.emacs.devel Subject: Re: Strange response after merge from upstream Date: Wed, 02 Dec 2009 19:55:21 +0200 Message-ID: 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 1259782028 22361 80.91.229.12 (2 Dec 2009 19:27:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 19:27:08 +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:27:01 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 1NFuqr-0002ke-5w for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 20:27:01 +0100 Original-Received: from localhost ([127.0.0.1]:51001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFuqq-0001Ia-QX for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 14:27:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFtQ4-0006Ao-B7 for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:55:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFtPz-000650-6l for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:55:15 -0500 Original-Received: from [199.232.76.173] (port=35561 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFtPz-00064j-19 for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:55:11 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:37693) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFtPx-0001k7-FI for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:55:10 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NFtPr-0000o7-TF for emacs-devel@gnu.org; Wed, 02 Dec 2009 18:55:03 +0100 Original-Received: from 92-49-243-221.dynamic.peoplenet.ua ([92.49.243.221]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 02 Dec 2009 18:55:03 +0100 Original-Received: from bialix by 92-49-243-221.dynamic.peoplenet.ua with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 02 Dec 2009 18:55:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92-49-243-221.dynamic.peoplenet.ua User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) In-Reply-To: <87ljhl500o.fsf@telefonica.net> X-Enigmail-Version: 0.96.0 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:118148 Archived-At: Óscar Fuentes пишет: > "Stephen J. Turnbull" writes: > >> Eli Zaretskii writes: >> >> > How is "merge --pull" different from merge followed by commit? >> > would it avoid the "1 extra revision" in the output of "missing"? >> >> Maybe. >> >> - "bzr merge" always merges, and you must commit. > > Correct. > >> - "bzr pull" does a trivial merge and commit if your local branch's >> tip revision is an ancestor of the remote revision, otherwise it >> aborts without changing anything. (A successful pull is also called >> a "fast forward".) > > `pull' never merges because there is nothing that can cause > conflicts. It's not quite true. If you have uncommitted yet changes in your branch, and you do pull from other branch, then pull will merge your uncommitted changes with pulled changes, and thus could create conflict. Something like running `cvs update` when you have some changes in the tree.