evolve: update public content divergence acc. to new behavior Now this method _pickresolutionparent() is to decide which cset would be the resolution parent and no need to update evolvestate here since we do that later.