Lost changes during merges

[Pavel Shevaev]

> hg clone -r 7721 -r 7684 repo
> (this will get only the parents of the merge, if you have other heads,
> you'll need to pull them as well either by adding them as -r options
> to the clone command or later by using pull -r)

I followed your advice and tried to reproduce the whole situation from
the developer who made the merge(Darthvader) point of view:

hg clone -r7718 -r7675 repo tmp   #since he made 2 merges I started
from the first one
cd tmp
hg merge                        #this went smoothly
hg ci -m "..."
hg pull -r7684 ../repo   # now pulling my changes
hg merge                        #OK, I got the the conflict, but I
****could see my changes****!

So this is really weird and I have to find out whether it's the
developer's fault, or his merge tool or there is something wrong about
his Mercurial version(issue 1327(?) as reported by Mads Kiilerich).

-- 
Best regards, Pavel