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 00:58:35 -0500 Message-ID: References: <833a3umrfx.fsf@gnu.org> <83skbuko4g.fsf@gnu.org> <87bpii55z0.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1259733535 28907 80.91.229.12 (2 Dec 2009 05:58:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 05:58:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 06:58:48 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 1NFiEi-000757-CG for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 06:58:48 +0100 Original-Received: from localhost ([127.0.0.1]:60138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFiEh-0004G8-Sx for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 00:58:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFiEb-0004En-HB for emacs-devel@gnu.org; Wed, 02 Dec 2009 00:58:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFiEW-0004DK-8p for emacs-devel@gnu.org; Wed, 02 Dec 2009 00:58:40 -0500 Original-Received: from [199.232.76.173] (port=60391 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFiEW-0004DH-18 for emacs-devel@gnu.org; Wed, 02 Dec 2009 00:58:36 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:40373) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFiEV-0004OI-Jt for emacs-devel@gnu.org; Wed, 02 Dec 2009 00:58:35 -0500 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1NFiEV-0001DH-0v; Wed, 02 Dec 2009 00:58:35 -0500 In-reply-to: <87bpii55z0.fsf@telefonica.net> (message from =?utf-8?Q?=C3=93scar_Fuentes?= on Wed, 02 Dec 2009 05:56:35 +0100) 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:118119 Archived-At: > From: Óscar_Fuentes > Date: Wed, 02 Dec 2009 05:56:35 +0100 > > merge -pull does this: > > if branches-diverged? > yes: merge (you need to explicitly commit afterwards) > no : pull (no need to commit) > > > would it avoid the "1 extra revision" in the output of "missing"? > > Yes, because your quickfixes/ branch did not diverged from the branch > you pulled from, so it will do a `pull', like you did on your trunk > branch. Thanks, but it doesn't seem to work here: after "bzr pull" in trunk/ and "bzr merge --pull" in quickfixes/, "bzr missing" still says that I "have 1 extra revision(s)" and cites the commit from yesterday. That could be understandable, but it also says I'm "missing 27 revision(s)" and seems to show the changes just merged from the trunk. Does this happen because of yesterday's "commit" after "merge"? Do I understand correctly that, to get rid of this, I need to "merge --pull" all the way, and even a single "merge; commit" will force the branches to diverge no matter what? Is there a way of ``resyncing'' the branch with the trunk, so that "bzr missing" shows no missing/extra revisions? Or did I do something wrong?