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: Thu, 11 Nov 2010 18:13:00 +0100 Message-ID: <87mxpf3hsz.fsf@telefonica.net> References: <837hglf61k.fsf@gnu.org> <8362w5f0lx.fsf@gnu.org> <87y6912cpg.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289496531 27002 80.91.229.12 (11 Nov 2010 17:28:51 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 11 Nov 2010 17:28:51 +0000 (UTC) Cc: Eli Zaretskii To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 11 18:28:47 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 1PGax5-0005be-4m for ged-emacs-devel@m.gmane.org; Thu, 11 Nov 2010 18:28:47 +0100 Original-Received: from localhost ([127.0.0.1]:37278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGary-0002fw-4z for ged-emacs-devel@m.gmane.org; Thu, 11 Nov 2010 12:23:30 -0500 Original-Received: from [140.186.70.92] (port=58495 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGajh-0008Da-Jv for emacs-devel@gnu.org; Thu, 11 Nov 2010 12:14:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGai3-0000hY-KB for emacs-devel@gnu.org; Thu, 11 Nov 2010 12:13:16 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:44713) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGai3-0000gn-Dl for emacs-devel@gnu.org; Thu, 11 Nov 2010 12:13:15 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PGai0-0005Pp-2Y for emacs-devel@gnu.org; Thu, 11 Nov 2010 18:13:12 +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 ; Thu, 11 Nov 2010 18:13:12 +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 ; Thu, 11 Nov 2010 18:13:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 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:0JWekCmsXeXhH8ek1HsZRBQAllo= 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:132547 Archived-At: Eli Zaretskii writes: >> > AFAIU, "-r A" is just a shorthand for "-r A..-1". If A is an >> > arbitrary revision on the branch being merged, you just cherry-pick >> > all the revisions from A to the branch tip. >> >> From "bzr help merge": >> >> > To merge changes up to and including revision 82 from bzr.dev: >> > >> > bzr merge -r 82 ../bzr.dev >> >> So it doesn't mean "from A", but "up to and including A". > > Okay, but it's still cherry-picking of a certain range of revisions, > right? Nope. It searches the common ancestor and merges from there to A. That's a real VC history merge, i.e. one that preserves commit identity. The last phrase is crucial. If you cherry-picked some commit on that range, bzr does not remember it and it will be merged again, this time preserving its revision id. (I don't know what happens if A was already merged (not cherry-picked))