Help needed with debugging a merge problem

[James Westby]

Hi all,

Today I was trying to help nekohayo to debug a problem
on IRC, and I'm stuck as to what is going on. I would
appreciate someone helping with it, or giving some
more pointers as to what to look for.

The problem is with doing a merge between two branches
with no common ancestory. The problem is that the
merge fails due to a missing revision in a KnitIndex.
It fails even without the -r0..-1 argument, so it
is dying before it even works out that there is no
merge base.

There was one knit branch, and one packs branch, but 
the problem still occurs with the knits upgraded
to packs. check reports no errors, and reconcile makes
no difference.

I've mirrored the branches to my junk space

bzr branch lp:~james-w/+junk/specto-jeff-new
bzr branch lp:~james-w/+junk/specto-jeff

and try and run bzr merge ../specto-jeff in specto-jeff-new.

While writing the mail I tried to merge the other
way, and I was told that they were not compatible, so
I did bzr upgrade --rich-root-pack in specto-jeff and
got the same error, so it seems that there is some
corruption in that branch that is not picked up by
check.

Thanks,

James