The enforce_newancestor_usage.diff patch fixes both msg10930 and the original 
msg8847 use cases.

Let me know if I should also post on mercurial-devel or if attaching the patch 
here is enough (I seem to remember the "dead on arrival" advice ;-) ).