From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Merging emacs-23 into trunk
Date: Thu, 11 Nov 2010 01:26:18 -0500
Message-ID: <E1PGQby-00026J-36@fencepost.gnu.org>
References: <jwvzktiyyuw.fsf-monnier+emacs@gnu.org>
	<E1PG9PB-0007lq-Mw@fencepost.gnu.org>
	<jwv1v6ttch5.fsf-monnier+emacs@gnu.org> <837hglf61k.fsf@gnu.org>
	<jwvmxphovjd.fsf-monnier+emacs@gnu.org> <8362w5f0lx.fsf@gnu.org>
	<87y6912cpg.fsf@telefonica.net>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Trace: dough.gmane.org 1289456795 2457 80.91.229.12 (11 Nov 2010 06:26:35 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Thu, 11 Nov 2010 06:26:35 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: =?utf-8?Q?=C3=93scar_Fuentes?= <ofv@wanadoo.es>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 11 07:26:31 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PGQcB-0002cd-21
	for ged-emacs-devel@m.gmane.org; Thu, 11 Nov 2010 07:26:31 +0100
Original-Received: from localhost ([127.0.0.1]:58921 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PGQcA-0006YT-B2
	for ged-emacs-devel@m.gmane.org; Thu, 11 Nov 2010 01:26:30 -0500
Original-Received: from [140.186.70.92] (port=33355 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PGQc1-0006YM-HO
	for emacs-devel@gnu.org; Thu, 11 Nov 2010 01:26:23 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1PGQc0-0007Ik-Bp
	for emacs-devel@gnu.org; Thu, 11 Nov 2010 01:26:21 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:50917)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1PGQc0-0007IZ-AC
	for emacs-devel@gnu.org; Thu, 11 Nov 2010 01:26:20 -0500
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1PGQby-00026J-36; Thu, 11 Nov 2010 01:26:18 -0500
In-reply-to: <87y6912cpg.fsf@telefonica.net> (message from
	=?utf-8?Q?=C3=93scar_Fuentes?= on Wed, 10 Nov 2010 20:36:11 +0100)
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." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:132536
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/132536>

> From: Óscar Fuentes <ofv@wanadoo.es>
> Date: Wed, 10 Nov 2010 20:36:11 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> [snip]
> 
> > 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?