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: Installing changes from branches Date: Sat, 03 Apr 2010 23:47:40 +0300 Message-ID: <837hoo1cwj.fsf@gnu.org> References: <4BB702D9.7000102@swipnet.se> <4BB75C2E.5010104@swipnet.se> <87tyrsy248.fsf@telefonica.net> <83aatk1ou3.fsf@gnu.org> <838w941nxh.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1270327675 24191 80.91.229.12 (3 Apr 2010 20:47:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 20:47:55 +0000 (UTC) Cc: ofv@wanadoo.es, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 22:47:51 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 1NyAFy-0006TB-Nz for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 22:47:51 +0200 Original-Received: from localhost ([127.0.0.1]:36871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyAFy-0000GD-8G for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 16:47:50 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NyAFs-0000Fq-SI for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:47:44 -0400 Original-Received: from [140.186.70.92] (port=41683 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyAFr-0000EX-L3 for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:47:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NyAFp-0003Zl-Ux for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:47:43 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:58664) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NyAFp-0003ZP-KX for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:47:41 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0L0B00E00IXBNK00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Sat, 03 Apr 2010 23:47:39 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.92.42]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L0B00CMQJ3DWM60@a-mtaout23.012.net.il>; Sat, 03 Apr 2010 23:47:39 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.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:123145 Archived-At: > From: Juanma Barranquero > Date: Sat, 3 Apr 2010 21:31:16 +0200 > Cc: ofv@wanadoo.es, Eli Zaretskii , emacs-devel@gnu.o= rg >=20 > On Sat, Apr 3, 2010 at 21:14, Stefan Monnier wrote: >=20 > > 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 me= rged, > > the diff will include the new changes on the "upstream" branch. = =C2=A0:-( > > > > Hopefully someone will tell me I'm wrong, >=20 > I haven't tested it, but that's not what the doc (bzr help revision= spec) says: I use it all the time, and AFAICS it behaves exactly like the doc says.