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 19:40:42 +0200 Message-ID: <83ocmhl1et.fsf@gnu.org> References: <833a3umrfx.fsf@gnu.org> <83skbuko4g.fsf@gnu.org> <87bpii55z0.fsf@telefonica.net> <87y6ll51tt.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1259781595 20832 80.91.229.12 (2 Dec 2009 19:19:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2009 19:19:55 +0000 (UTC) Cc: ofv@wanadoo.es, oscarfv@telefonica.net, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 20:19: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 1NFujq-0007o0-NO for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 20:19:46 +0100 Original-Received: from localhost ([127.0.0.1]:60430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFujq-0002OV-7m for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2009 14:19:46 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFtE0-0007YI-9k for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:42:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFtDv-0007TH-2k for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:42:47 -0500 Original-Received: from [199.232.76.173] (port=36251 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFtDu-0007TA-TM for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:42:42 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:44327) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFtDu-0000PA-KP for emacs-devel@gnu.org; Wed, 02 Dec 2009 12:42:42 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KU100C00D6S8200@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 02 Dec 2009 19:42:41 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.213.252]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KU10017TD73VIT0@a-mtaout20.012.net.il>; Wed, 02 Dec 2009 19:42:40 +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:118143 Archived-At: > From: Stefan Monnier > Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , > ofv@wanadoo.es, emacs-devel@gnu.org > Date: Wed, 02 Dec 2009 09:31:06 -0500 > > > 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. Yes, of course. But then I won't be surprised ;-)