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: Installing changes from branches Date: Sat, 03 Apr 2010 15:14:25 -0400 Message-ID: References: <4BB702D9.7000102@swipnet.se> <4BB75C2E.5010104@swipnet.se> <87tyrsy248.fsf@telefonica.net> <83aatk1ou3.fsf@gnu.org> <838w941nxh.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1270322088 8126 80.91.229.12 (3 Apr 2010 19:14:48 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 19:14:48 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 21:14:38 2010 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.69) (envelope-from ) id 1Ny8nm-0007Nj-Dj for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 21:14:38 +0200 Original-Received: from localhost ([127.0.0.1]:43510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny8nl-0004ve-G6 for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 15:14:37 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ny8nh-0004uV-4S for emacs-devel@gnu.org; Sat, 03 Apr 2010 15:14:33 -0400 Original-Received: from [140.186.70.92] (port=54258 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny8nd-0004tU-W6 for emacs-devel@gnu.org; Sat, 03 Apr 2010 15:14:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ny8nd-0002Cq-5a for emacs-devel@gnu.org; Sat, 03 Apr 2010 15:14:29 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:29552 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ny8nb-0002Ca-HN; Sat, 03 Apr 2010 15:14:27 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAM4wt0tFpZE8/2dsb2JhbACbSnK0UIUHBIsq X-IronPort-AV: E=Sophos;i="4.51,357,1267419600"; d="scan'208";a="60163320" Original-Received: from 69-165-145-60.dsl.teksavvy.com (HELO pastel.home) ([69.165.145.60]) by ironport2-out.pppoe.ca with ESMTP; 03 Apr 2010 15:14:26 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id D76CD85F0; Sat, 3 Apr 2010 15:14:25 -0400 (EDT) In-Reply-To: <838w941nxh.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 03 Apr 2010 19:49:30 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.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:123139 Archived-At: > bzr diff -rsubmit: > ../foo > The revision designated by `submit:' is the last common ancestor > between the trunk and the test branch, Actually, IIUC (and last time I checked) this is not quite true, it's just a diff w.r.t the head of the branch from which you merge. I.e. if this "upstream" branch has been updated since you last merged, the diff will include the new changes on the "upstream" branch. :-( Hopefully someone will tell me I'm wrong, Stefan