From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: James Westby <jw+debian@jameswestby.net>
Newsgroups: gmane.comp.version-control.bazaar-ng.general,gmane.emacs.devel
Subject: Re: Emacs Bazaar repository
Date: Fri, 14 Mar 2008 15:21:47 +0000
Message-ID: <1205508107.6161.421.camel@flash>
References: <87skyvse7k.fsf@xmission.com> <jeprtyalxt.fsf@sykes.suse.de>
	<86ejae96t4.fsf@lola.quinscape.zz> <vpqskytvd8q.fsf@bauges.imag.fr>
	<umyp1iimf.fsf@gnu.org> <47DA3601.3040507@arbash-meinel.com>
	<jehcf92zyk.fsf@sykes.suse.de> <vpq8x0lqtq7.fsf@bauges.imag.fr>
	<je3aqt2xaa.fsf@sykes.suse.de>
	<dadef4640803140815t45ea2e9fj73841053c4dc6618@mail.gmail.com>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Trace: ger.gmane.org 1205508037 28581 80.91.229.12 (14 Mar 2008 15:20:37 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Fri, 14 Mar 2008 15:20:37 +0000 (UTC)
Cc: bazaar@lists.canonical.com, dak@gnu.org,
	Matthieu Moy <Matthieu.Moy@imag.fr>,
	Andreas Schwab <schwab@suse.de>, emacs-devel@gnu.org,
	Eli Zaretskii <eliz@gnu.org>
To: David Allouche <david@allouche.net>
Original-X-From: bazaar-bounces@lists.canonical.com Fri Mar 14 16:21:04 2008
Return-path: <bazaar-bounces@lists.canonical.com>
Envelope-to: gcvbg-bazaar-ng@m.gmane.org
Original-Received: from chlorine.canonical.com ([91.189.94.204])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1JaBiS-0000Fz-0T
	for gcvbg-bazaar-ng@m.gmane.org; Fri, 14 Mar 2008 16:21:04 +0100
Original-Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com)
	by chlorine.canonical.com with esmtp (Exim 4.60)
	(envelope-from <bazaar-bounces@lists.canonical.com>)
	id 1JaBhs-0006kD-1w; Fri, 14 Mar 2008 15:20:28 +0000
Original-Received: from jameswestby.net ([89.145.97.141])
	by chlorine.canonical.com with esmtp (Exim 4.60)
	(envelope-from <jw+debian@jameswestby.net>) id 1JaBhn-0006jy-O3
	for bazaar@lists.canonical.com; Fri, 14 Mar 2008 15:20:23 +0000
Original-Received: from 77-99-12-164.cable.ubr13.azte.blueyonder.co.uk ([77.99.12.164]
	helo=[192.168.1.109])
	by jameswestby.net with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <jw+debian@jameswestby.net>)
	id 1JaBhm-0006WS-3c; Fri, 14 Mar 2008 15:20:22 +0000
In-Reply-To: <dadef4640803140815t45ea2e9fj73841053c4dc6618@mail.gmail.com>
X-Mailer: Evolution 2.22.0 
X-BeenThere: bazaar@lists.canonical.com
X-Mailman-Version: 2.1.8
Precedence: list
List-Id: bazaar discussion <bazaar.lists.canonical.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/listinfo/bazaar>,
	<mailto:bazaar-request@lists.canonical.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/bazaar>
List-Post: <mailto:bazaar@lists.canonical.com>
List-Help: <mailto:bazaar-request@lists.canonical.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/bazaar>,
	<mailto:bazaar-request@lists.canonical.com?subject=subscribe>
Original-Sender: bazaar-bounces@lists.canonical.com
Errors-To: bazaar-bounces@lists.canonical.com
Xref: news.gmane.org gmane.comp.version-control.bazaar-ng.general:38589 gmane.emacs.devel:92575
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/92575>

On Fri, 2008-03-14 at 16:15 +0100, David Allouche wrote:
> You can do fast forward in bzr with "pull". Merge behave differently
> because we consider that "merge" _as a task_ has a different meaning
> _to the user_ than pull.

And if you disagree please add a bzr alias to alias "merge" to
"merge --pull", and you will get the behaviour that you want.

Thanks,

James