From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Installing changes from branches Date: Sat, 3 Apr 2010 21:31:16 +0200 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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1270323156 11405 80.91.229.12 (3 Apr 2010 19:32:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 19:32:36 +0000 (UTC) Cc: ofv@wanadoo.es, Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 21:32:30 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 1Ny94M-0006mc-GQ for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 21:31:46 +0200 Original-Received: from localhost ([127.0.0.1]:37657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny94L-0008P7-Ge for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 15:31:45 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ny94G-0008Mn-DY for emacs-devel@gnu.org; Sat, 03 Apr 2010 15:31:40 -0400 Original-Received: from [140.186.70.92] (port=32796 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny94F-0008LK-9F for emacs-devel@gnu.org; Sat, 03 Apr 2010 15:31:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ny94D-0004rI-P3 for emacs-devel@gnu.org; Sat, 03 Apr 2010 15:31:39 -0400 Original-Received: from mail-bw0-f223.google.com ([209.85.218.223]:38404) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ny94D-0004qP-H4; Sat, 03 Apr 2010 15:31:37 -0400 Original-Received: by bwz23 with SMTP id 23so172907bwz.26 for ; Sat, 03 Apr 2010 12:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:received:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=3kMpGK6uWBsexckSLFM3B5seqK8sF1ARJCDWCko0ESQ=; b=lKaNjAb4DTGUU0EmMkEJ8G2hfLlgyqhK4fSu2IMNP/F2BU0jS0cLaiFprrsiRP9K2k w1/czkjS5GUMwywlpJ8GlhOVtuxBOZTr7xqY2FDB2QpeUpMG/AmESXVOiXzbRyBbRPxI UkSaq3DFofOa+1JobmkNC174MDFBRlVPNTmzE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=x53zowtXS/MIvijF9UaY5Kli9wAq2J+asiE/GMlbFbJvglw+lR/deej3EENYoXTSRu kAucMZiVYaU1XYTnpqQyptcEIJupp4jnCAroYBAoqd378Lxz9CSISEPz94mfsJLUHYvM WIem1fCquaNBOKMWMbl5C81Nm/ysshVCRdbDA= Original-Received: by 10.204.136.15 with HTTP; Sat, 3 Apr 2010 12:31:16 -0700 (PDT) In-Reply-To: Original-Received: by 10.204.81.134 with SMTP id x6mr4391929bkk.32.1270323096143; Sat, 03 Apr 2010 12:31:36 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:123143 Archived-At: On Sat, Apr 3, 2010 at 21:14, Stefan Monnier wro= te: > 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. =C2=A0:-( > > Hopefully someone will tell me I'm wrong, I haven't tested it, but that's not what the doc (bzr help revisionspec) sa= ys: submit: Diffing against this shows all the changes that were made in this branc= h, and is a good predictor of what merge will do. The submit branch is used by the bundle and merge directive commands. If no submit branch is specified, the parent branch is used instead. The common ancestor is the last revision that existed in both branches. Usually this is the branch point, but it could also be a revision that was merged. Examples: $ bzr diff -r submit: Juanma