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: Sun, 4 Apr 2010 16:58:24 +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 X-Trace: dough.gmane.org 1270393204 10296 80.91.229.12 (4 Apr 2010 15:00:04 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 4 Apr 2010 15:00:04 +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 Sun Apr 04 16:59:57 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 1NyRIp-0004d4-1c for ged-emacs-devel@m.gmane.org; Sun, 04 Apr 2010 16:59:55 +0200 Original-Received: from localhost ([127.0.0.1]:33206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyRIo-0005ad-HL for ged-emacs-devel@m.gmane.org; Sun, 04 Apr 2010 10:59:54 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NyRHl-0005E0-Gp for emacs-devel@gnu.org; Sun, 04 Apr 2010 10:58:49 -0400 Original-Received: from [140.186.70.92] (port=48038 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyRHk-0005DS-5V for emacs-devel@gnu.org; Sun, 04 Apr 2010 10:58:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NyRHh-0005Vo-P0 for emacs-devel@gnu.org; Sun, 04 Apr 2010 10:58:47 -0400 Original-Received: from mail-bw0-f223.google.com ([209.85.218.223]:34656) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NyRHh-0005Vj-IW; Sun, 04 Apr 2010 10:58:45 -0400 Original-Received: by bwz23 with SMTP id 23so508404bwz.26 for ; Sun, 04 Apr 2010 07:58:44 -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; bh=XyugDdZlYYud1ACbOmSbtuof5iMT6AYMyuJv1il4LUg=; b=Flz9CTdHDjzgozzTdoPq4dF1py+3oW6xQtjWPlhCwT5j7Wojbjq/THYCPYettAiaRt Va9ipLmcagVKrg4RsKApveI4rx/fcgsSLaEyhQnKJux0Bb8Z7MHXWFUh2nX123PGZNwb mcLPSvtmcOjXKlu32XaTm41u87ykGu/gcyrjY= 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; b=cApBzJYZJR6LcTbWC35lMTnl8eV952neMxehaZ0hJVcWpcKZLEV9j5aMeR022r893j RJOwbC93JLrqddUdE3yMx58djVpn48W1L9ipiyvlCyulHsvPiIisIOXbenxLkeLCBvua AY8DZiPZ6QQO7BSWalYfX057q+HQ/0TQXWI4I= Original-Received: by 10.204.136.15 with HTTP; Sun, 4 Apr 2010 07:58:24 -0700 (PDT) In-Reply-To: Original-Received: by 10.204.82.227 with SMTP id c35mr5492709bkl.174.1270393124180; Sun, 04 Apr 2010 07:58:44 -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:123166 Archived-At: On Sun, Apr 4, 2010 at 16:18, Stefan Monnier wrote: > I don't see anything in the text you quoted that says that > "diff -rsubmit:" will shows the diff w.r.t. the common ancestor. No, but it does say that "shows all the changes that were made in this branch", which I think is what Eli wanted. And you said: > if this "upstream" branch has been updated since you last merged, > the diff will include the new changes on the "upstream" branch. which I think it's not true. Juanma