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: Merging emacs-23 into trunk Date: Fri, 12 Nov 2010 15:41:59 -0500 Message-ID: References: <837hglf61k.fsf@gnu.org> <8739r93rg5.fsf@telefonica.net> <871v6ry5ly.fsf@telefonica.net> <87iq02wkm4.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289855167 3934 80.91.229.12 (15 Nov 2010 21:06:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 15 Nov 2010 21:06:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 15 22:06:02 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 1PI6FW-0007tL-Gu for ged-emacs-devel@m.gmane.org; Mon, 15 Nov 2010 22:06:02 +0100 Original-Received: from localhost ([127.0.0.1]:34939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PI6FV-0004SG-QG for ged-emacs-devel@m.gmane.org; Mon, 15 Nov 2010 16:06:01 -0500 Original-Received: from [140.186.70.92] (port=58356 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PI6F4-0004Ln-W3 for emacs-devel@gnu.org; Mon, 15 Nov 2010 16:05:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PI6Es-0003YO-KI for emacs-devel@gnu.org; Mon, 15 Nov 2010 16:05:34 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:57043 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PI6Es-0003Xx-Dk for emacs-devel@gnu.org; Mon, 15 Nov 2010 16:05:22 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0GAA4v4UxFpY76/2dsb2JhbAChXH1ywDuFSgSEWo1f X-IronPort-AV: E=Sophos;i="4.59,201,1288584000"; d="scan'208";a="82622098" Original-Received: from 69-165-142-250.dsl.teksavvy.com (HELO ceviche.home) ([69.165.142.250]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 15 Nov 2010 16:05:21 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 50960661E3; Fri, 12 Nov 2010 15:41:59 -0500 (EST) In-Reply-To: <87iq02wkm4.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Fri, 12 Nov 2010 17:51:47 +0100") 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:132653 Archived-At: >>> Yes, when A (or its parent) already is on the target branch with the >>> same revision-id as it has on the source branch. >> >> Which is exactly the situation I was talking about: >> >> And indeed >> bzr merge -r A..B >> will correctly track the history in the case where A has already been >> merged and committed. > "merge -r A..B" usually means a cherry-pick, In the context of "where A has already been merged and committed", it's not "usually" a cherry-pick: it's never a cherry-pick. > because for the case when > it is a merge there is no reason to specify A (the tool figures it out > automatically) but it seems that you missed the syntax "merge -r B" No, I didn't miss this syntax (as you can tell by looking at the code I sent ;-). Stefan