view .hg-format-source @ 5563:9034eef6e737

evolve: resolutionparent should be succs of otherp1

In current behavior when one of the divergent cset is ahead
of other, we set successor of ahead one's parent as resolution
parent.
This patch make sure that we follow the same logic for the case
when "other" is ahead of "divergent".

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}