From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar?= Fuentes Newsgroups: gmane.emacs.devel Subject: Re: Merging emacs-23 into trunk Date: Fri, 12 Nov 2010 17:51:47 +0100 Message-ID: <87iq02wkm4.fsf@telefonica.net> References: <837hglf61k.fsf@gnu.org> <8739r93rg5.fsf@telefonica.net> <871v6ry5ly.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289580740 25187 80.91.229.12 (12 Nov 2010 16:52:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 12 Nov 2010 16:52:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 12 17:52:15 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 1PGwrG-0008Oj-AY for ged-emacs-devel@m.gmane.org; Fri, 12 Nov 2010 17:52:14 +0100 Original-Received: from localhost ([127.0.0.1]:52937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGwrF-0007vM-Mc for ged-emacs-devel@m.gmane.org; Fri, 12 Nov 2010 11:52:13 -0500 Original-Received: from [140.186.70.92] (port=54751 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGwr6-0007te-1z for emacs-devel@gnu.org; Fri, 12 Nov 2010 11:52:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGwr4-0002Db-Rk for emacs-devel@gnu.org; Fri, 12 Nov 2010 11:52:03 -0500 Original-Received: from impaqm1.telefonica.net ([213.4.138.17]:46768 helo=telefonica.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGwr4-0002DS-Gk for emacs-devel@gnu.org; Fri, 12 Nov 2010 11:52:02 -0500 Original-Received: from IMPmailhost1.adm.correo ([10.20.102.38]) by IMPaqm1.telefonica.net with bizsmtp id W6LE1f00Z0piX6q01GrzXu; Fri, 12 Nov 2010 17:51:59 +0100 Original-Received: from qcore ([83.36.171.62]) by IMPmailhost1.adm.correo with BIZ IMP id WGrn1f00C1M7cV71hGro1k; Fri, 12 Nov 2010 17:51:59 +0100 X-Brightmail-Tracker: AAAAAA== X-original-sender: 981711563@telefonica.net In-Reply-To: (Stefan Monnier's message of "Thu, 11 Nov 2010 18:06:59 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:132585 Archived-At: Stefan Monnier writes: >> 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, 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"