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: Wed, 02 Dec 2009 09:31:06 -0500 Message-ID: References: <833a3umrfx.fsf@gnu.org> <83skbuko4g.fsf@gnu.org> <87bpii55z0.fsf@telefonica.net> <87y6ll51tt.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259774492 28311 80.91.229.12 (2 Dec 2009 17:21:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 17:21:32 +0000 (UTC) Cc: ofv@wanadoo.es, =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 18:21: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 1NFstJ-00049a-1V for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 18:21:25 +0100 Original-Received: from localhost ([127.0.0.1]:56817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFstI-0005uk-JF for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 12:21:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFqEd-0001Ud-TX for emacs-devel@gnu.org; Wed, 02 Dec 2009 09:31:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFqEY-0001PJ-E6 for emacs-devel@gnu.org; Wed, 02 Dec 2009 09:31:14 -0500 Original-Received: from [199.232.76.173] (port=59185 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFqEX-0001P2-Vg for emacs-devel@gnu.org; Wed, 02 Dec 2009 09:31:10 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:32657 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFqEW-0008PY-1n; Wed, 02 Dec 2009 09:31:08 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgoFAIUIFktLd/5a/2dsb2JhbACBTtYPhDEEihU X-IronPort-AV: E=Sophos;i="4.47,328,1257138000"; d="scan'208";a="50489729" Original-Received: from 75-119-254-90.dsl.teksavvy.com (HELO pastel.home) ([75.119.254.90]) by ironport2-out.pppoe.ca with ESMTP; 02 Dec 2009 09:31:07 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 04D8F86C4; Wed, 2 Dec 2009 09:31:07 -0500 (EST) In-Reply-To: (Eli Zaretskii's message of "Wed, 02 Dec 2009 05:53:53 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:118137 Archived-At: > Thanks, these two followed by "bzr merge --pull" seem to have solved > the issue. I will use "merge --pull" from now on, as long as no > development goes on on quickfixes/, and see if it stays in sync. If the branch ever diverges, you won't be able to use `pull' again until you `push' that branch's changes upstream. Stefan