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: Wed, 10 Nov 2010 07:03:57 -0500
Message-ID: <E1PG9PB-0007lq-Mw@fencepost.gnu.org>
References: <jwvzktiyyuw.fsf-monnier+emacs@gnu.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1289390651 32715 80.91.229.12 (10 Nov 2010 12:04:11 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 10 Nov 2010 12:04:11 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 13:04:06 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 1PG9PK-0006zU-Bm
	for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 13:04:06 +0100
Original-Received: from localhost ([127.0.0.1]:60761 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PG9PJ-0000Uu-QL
	for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 07:04:05 -0500
Original-Received: from [140.186.70.92] (port=40859 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PG9PE-0000S8-DC
	for emacs-devel@gnu.org; Wed, 10 Nov 2010 07:04:01 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1PG9PD-0005I3-9A
	for emacs-devel@gnu.org; Wed, 10 Nov 2010 07:04:00 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:54659)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1PG9PD-0005Hz-6O
	for emacs-devel@gnu.org; Wed, 10 Nov 2010 07:03:59 -0500
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1PG9PB-0007lq-Mw; Wed, 10 Nov 2010 07:03:57 -0500
In-reply-to: <jwvzktiyyuw.fsf-monnier+emacs@gnu.org> (message from Stefan
	Monnier on Tue, 09 Nov 2010 16:30:10 -0500)
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:132502
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/132502>

> From: Stefan Monnier <monnier@IRO.UMontreal.CA>
> Date: Tue, 09 Nov 2010 16:30:10 -0500
> 
> It's [...] scaringly slow (to some extent because of
> bzr's braindead lack of support for merging into a tree that's not
> clean).

I wanted to suggest "merge --force", but I see that you already tried
that:

>             ;; Stupidly, "bzr merge --force -r A..B" dos not maintain the
>             ;; metadata properly except when the checkout is clean.

Do you mean that "bzr merge --force" merges the text, but not the
history?  If not, what exactly is the problem?