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 00:23:46 +0200 Message-ID: References: <833a3umrfx.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1259707232 4238 80.91.229.12 (1 Dec 2009 22:40:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Dec 2009 22:40:32 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 01 23:40:25 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 1NFbOS-0001PW-Nj for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 23:40:25 +0100 Original-Received: from localhost ([127.0.0.1]:38095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFbOS-0008Gw-6N for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 17:40:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFbOM-0008FT-Fw for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:40:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFbOI-0008E7-4f for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:40:18 -0500 Original-Received: from [199.232.76.173] (port=45246 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFbOH-0008E4-T8 for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:40:13 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:37307) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFbOH-0002Ol-EG for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:40:13 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NFbOF-0001JB-Ag for emacs-devel@gnu.org; Tue, 01 Dec 2009 23:40:11 +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 ; Tue, 01 Dec 2009 23:40:11 +0100 Original-Received: from bialix by 92-49-243-221.dynamic.peoplenet.ua with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 01 Dec 2009 23:40:11 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 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: <833a3umrfx.fsf@gnu.org> 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:118086 Archived-At: Eli Zaretskii пишет: > 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" after > that in quickfixes/ says I "have 1 extra revision(s)" and shows all > 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 copy > of the trunk, and thus has no "extra revision(s)". Yes, after merge you did commit, therefore you have 1 extra revision (just committed). You may want to use `bzr merge --pull` to get equivalent of git fast-forward merge. merge --pull will pull new changes from other branch if possible, thus 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.