merge uses wrong ancestor (and consequently does the wrong thing)

[Benoit Boissinot]

On Mon, Oct 6, 2008 at 2:08 PM, Stefan Ring
<e9725446 at student.tuwien.ac.at> wrote:
> I have stumbled across a really nasty consequence of the "only store
> identical revisions once" policy. In fact, this is the second time I
> have a complaint about Mercurial (I love it, btw!). And after a lot of
> head scratching, it turns out that the root cause is exactly the same
> as in my first complaint (see
> <http://www.selenic.com/pipermail/mercurial/2008-March/017702.html>).
>

Indeed.

hg init
echo a > a
hg ci -Am m
echo b >> a
hg ci -Am m
echo a > a
hg ci -Am m
hg up 0
echo b >> a
hg ci -Am m
hg view
hg merge --debug
cat a

You'll get 'a\n' instead of 'a\nb\n'.

Can you open a bugreport please ?

regards,

Benoit