From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Strange response after merge from upstream Date: Tue, 01 Dec 2009 17:04:53 -0500 Message-ID: References: <833a3umrfx.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259705449 31115 80.91.229.12 (1 Dec 2009 22:10:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Dec 2009 22:10:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 01 23:10:42 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 1NFavh-0005o5-61 for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 23:10:41 +0100 Original-Received: from localhost ([127.0.0.1]:38732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFavg-0002Sv-RR for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 17:10:40 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFatB-0001FX-8t for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:08:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFat7-0001Cq-2B for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:08:04 -0500 Original-Received: from [199.232.76.173] (port=57929 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFat6-0001Cd-HT for emacs-devel@gnu.org; Tue, 01 Dec 2009 17:08:00 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:40654) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFat0-0006VU-UW; Tue, 01 Dec 2009 17:07:55 -0500 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id nB1M4r0G007518; Tue, 1 Dec 2009 17:04:53 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 7DAE13A14D; Tue, 1 Dec 2009 17:04:53 -0500 (EST) In-Reply-To: <833a3umrfx.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 01 Dec 2009 21:20:50 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-NAI-Spam-Level: X-NAI-Spam-Score: 0.5 X-NAI-Spam-Rules: 2 Rules triggered DATE_FUTURE=0.5, RV3418=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:118079 Archived-At: > 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), The bzr repository in svannah is not auto-updated at all, AFAIK. Is it? > 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)". As you've made a "commit", you created a new revision which is not in the upstream branch. Stefan