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 08:05:11 +0100 Message-ID: <87ljhl500o.fsf@telefonica.net> References: <833a3umrfx.fsf@gnu.org> <83skbuko4g.fsf@gnu.org> <87pr6xvr5r.fsf@uwakimon.sk.tsukuba.ac.jp> 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 1259737580 4872 80.91.229.12 (2 Dec 2009 07:06:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 07:06:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 08:06:13 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 1NFjHu-0000cX-Qw for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 08:06:11 +0100 Original-Received: from localhost ([127.0.0.1]:57970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFjHu-00046K-FN for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 02:06:10 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFjHg-0003zL-OQ for emacs-devel@gnu.org; Wed, 02 Dec 2009 02:05:56 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFjHb-0003uY-HH for emacs-devel@gnu.org; Wed, 02 Dec 2009 02:05:55 -0500 Original-Received: from [199.232.76.173] (port=33221 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFjHb-0003ta-2y for emacs-devel@gnu.org; Wed, 02 Dec 2009 02:05:51 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:47349) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFjHZ-0001kA-SY for emacs-devel@gnu.org; Wed, 02 Dec 2009 02:05:50 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NFjHU-0000Tq-LA for emacs-devel@gnu.org; Wed, 02 Dec 2009 08:05:44 +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 08:05:44 +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 08:05:44 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 73 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:DmkO1k/L5JYFS7tUw2bUyCpQxZE= 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:118125 Archived-At: "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. The scenario where `pull' works is this: my_mirror: A B C D upstream : A B C D E F After pull: my_mirror: A B C D E F upstream : A B C D E F It is impossible to get a conflict here. It just adds the revisions to the DAG. However, if you have something like this: my_branch: A B C D X upstream : A B C D E F conflicts may arise and you must merge to obtain my_branch: A-B-C-D-X------M \--E-F-/ upstream : A B C D E F M is the commit you make after the merge, aka the "merge point". Even if the branches didn't diverged, a `merge' creates a different graph than a `pull'. This is the state before the operations: upstream : A B C D E F my_pull : A B C D my_merge : A B C D This is after: upstream : A B C D E F my_pull : A B C D E F my_merge : A-B-C-D-X------M \--E-F-/ This is most obvious on the output of `bzr log'. "fast forward" is git lingo. [snip] -- Óscar