Re: Merging emacs-23 into trunk

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> 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?