evolve: support ancestor split with unrelated changeset in between

Of course, the changesets would need to be folded before landing. I’ve left them split so that the changes can be discussed independently.