Re: Confusing "bzr log" as result of merges

[Eli Zaretskii <eliz@gnu.org>]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Mon, 23 May 2011 09:02:37 -0300
> 
> >> > tool.  The discrepancy here happens because bzrmerge.el plays unholy
> >> > games with the metadata as opposed to the sources.  If we need to do
> >> You are confused: the metadata resulting from bzrmerge.el is 100%
> >> identical to the metadata resulting from "bzr merge".
> > I don't think I'm confused that much: I said "metadata as opposed to
> > the sources".
> 
> Merging with bzrmerge.el instead of with "bzr merge" should result in
> an absolutely identical result, except for the fact that the guy doing
> the merge will have to do a bit less work.

The problem is not that we are merging, but that we merge revisions we
don't need.  We then revert the effect of the merge in the sources,
but the metadata "remembers" that the reverted revision is in the
trunk.

Doing the same manually will obviously produce the same result, but my
point was why do it at all.

IOW, I'm not saying that bzrmerge.el is the culprit.  I'm saying that
the method we use to merge from emacs-23 (which is implemented by
bzrmerge.el) is the culprit.