From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Strange response after merge from upstream Date: Wed, 02 Dec 2009 06:15:27 +0200 Message-ID: <83skbuko4g.fsf@gnu.org> References: <833a3umrfx.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1259727467 17607 80.91.229.12 (2 Dec 2009 04:17:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 04:17:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alexander Belchenko Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 05:17:40 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 1NFgen-0006uA-DD for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 05:17:37 +0100 Original-Received: from localhost ([127.0.0.1]:58289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFgem-0006LN-Ur for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 23:17:36 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFgeh-0006LA-H6 for emacs-devel@gnu.org; Tue, 01 Dec 2009 23:17:31 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFged-0006Ki-UB for emacs-devel@gnu.org; Tue, 01 Dec 2009 23:17:31 -0500 Original-Received: from [199.232.76.173] (port=54919 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFged-0006Kf-P4 for emacs-devel@gnu.org; Tue, 01 Dec 2009 23:17:27 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:56367) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFged-00048d-4Z for emacs-devel@gnu.org; Tue, 01 Dec 2009 23:17:27 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KU000100BKSCC00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 02 Dec 2009 06:17:26 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.213.252]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KU000147BX1L200@a-mtaout20.012.net.il>; Wed, 02 Dec 2009 06:17:26 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:118109 Archived-At: > From: Alexander Belchenko > Date: Wed, 02 Dec 2009 00:23:46 +0200 >=20 > Eli Zaretskii =D0=C9=DB=C5=D4: > > I created a repository with a trunk/ and quickfixes/ branches in = it, > > just like the wiki says. I waited a day without making any > > modifications in quickfixes/ (it looks like the bzr repository is= only > > updated once a day), and then did a "bzr pull" in trunk/ and "bzr > > merge; bzr commit" in quickfixes/. Strangely, "bzr missing" afte= r > > that in quickfixes/ says I "have 1 extra revision(s)" and shows a= ll > > the files merged from the trunk. Is that expected? it surprised = me, > > because I thought the result would be a branch that is an exact c= opy > > of the trunk, and thus has no "extra revision(s)". >=20 > Yes, after merge you did commit, therefore you have 1 extra revisio= n (just committed). I understand that, but that commit was because merge by itself does not commit the changes I pulled from the mainline. Without the commit, bzr was even less happy. I guess I expected to see nothing from "missing" after these operations, since really the branch is an exact copy of the upstream. Evidently, that's not "missing"'s logic and purpose. "bzr diff" did come up empty-handed, as expected. > You may want to use `bzr merge --pull` to get equivalent of git fas= t-forward merge. > merge --pull will pull new changes from other branch if possible, t= hus make your branch a copy of > the other branch. Or it will do merge when 2 branches are diverged,= i.e. both branches has new > commits, not present in other branch. I don't know git. How is "merge --pull" different from merge followe= d by commit? would it avoid the "1 extra revision" in the output of "missing"?