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: Thu, 11 Nov 2010 14:57:40 -0500 Message-ID: References: <837hglf61k.fsf@gnu.org> <8739r93rg5.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289506238 11500 80.91.229.12 (11 Nov 2010 20:10:38 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 11 Nov 2010 20:10:38 +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 Thu Nov 11 21:10:34 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 1PGdTd-0007Rj-P0 for ged-emacs-devel@m.gmane.org; Thu, 11 Nov 2010 21:10:33 +0100 Original-Received: from localhost ([127.0.0.1]:33600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGdTd-0006BX-2w for ged-emacs-devel@m.gmane.org; Thu, 11 Nov 2010 15:10:33 -0500 Original-Received: from [140.186.70.92] (port=53833 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGdHD-0003Lc-FG for emacs-devel@gnu.org; Thu, 11 Nov 2010 14:57:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGdHC-00077b-1r for emacs-devel@gnu.org; Thu, 11 Nov 2010 14:57:43 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:5874 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGdHB-00077K-VZ for emacs-devel@gnu.org; Thu, 11 Nov 2010 14:57:42 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AiEHANPZ20xMCpqE/2dsb2JhbAChTXpywkGFSgSEWo1f X-IronPort-AV: E=Sophos;i="4.59,184,1288584000"; d="scan'208";a="82263908" Original-Received: from 76-10-154-132.dsl.teksavvy.com (HELO pastel.home) ([76.10.154.132]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 11 Nov 2010 14:57:40 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 5948BA86F1; Thu, 11 Nov 2010 14:57:40 -0500 (EST) In-Reply-To: <8739r93rg5.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Wed, 10 Nov 2010 20:32:26 +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:132551 Archived-At: >>> You are cherry-picking here; cherry-picking is explicitly not tracked >>> in the history DAG. >> Actually, I'm not cherry-picking: Since all changes until A have been >> merged, merging A..B will end up with all changes until B: I'm not >> picking some changes and avoiding others. >> And indeed >> bzr merge -r A..B >> will correctly track the history in the case where A has already been >> merged and committed. > No. It will keep the order of the commits, but that's is all it does as > far as the VC history is concerned. I have no idea what you mean by the above, but I have tried and tested bzr merge -r A..B and in all my tests, in the case where A has already been merged into the current tree, it behaves exactly like bzr merge -r B with respect to history-tracking. Stefan