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: Wed, 10 Nov 2010 20:32:26 +0100 Message-ID: <8739r93rg5.fsf@telefonica.net> References: <837hglf61k.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289417575 11579 80.91.229.12 (10 Nov 2010 19:32:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 10 Nov 2010 19:32:55 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 20:32:49 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 1PGGPZ-0006bH-9C for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 20:32:49 +0100 Original-Received: from localhost ([127.0.0.1]:44003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGGPY-00064o-ML for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 14:32:48 -0500 Original-Received: from [140.186.70.92] (port=35426 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGGPQ-00063L-Rk for emacs-devel@gnu.org; Wed, 10 Nov 2010 14:32:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGGPP-0002PY-J0 for emacs-devel@gnu.org; Wed, 10 Nov 2010 14:32:40 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:44879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGGPP-0002PM-Bg for emacs-devel@gnu.org; Wed, 10 Nov 2010 14:32:39 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PGGPN-0006Wy-MT for emacs-devel@gnu.org; Wed, 10 Nov 2010 20:32:37 +0100 Original-Received: from 62.red-83-36-171.dynamicip.rima-tde.net ([83.36.171.62]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 10 Nov 2010 20:32:37 +0100 Original-Received: from ofv by 62.red-83-36-171.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 10 Nov 2010 20:32:37 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 34 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 62.red-83-36-171.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:rf1eV8fv3q5T41xGh+JBQkMHfsk= 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:132525 Archived-At: Stefan Monnier writes: >> 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. In general, merge -r A..C is the same as the sequence merge -c A merge -c B merge -c C When you cherry-pick a commit (either individually or as a part of a range) that commit loses its identity and appears as a new one on the target branch. bzr has no way of knowing that a commit you cherry-picked already is on the target branch, and hence it will not complain if you merge it again. `bzr qlog' on trunk just after cherry-picking the changes from emacs-23 will be illustrative. [snip]