Read about our upcoming Code of Conduct on this issue

Commit 09b31aa0 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

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".
parent 5907b495901e
Pipeline #10324 passed with stage
in 6 minutes and 32 seconds
......@@ -413,7 +413,7 @@ def _prepcontentdivresolution(ui, repo, divergent, other, evolvestate):
relocatereq = True
divergent, other = swapnodes(divergent, other)
resolutionparent = divergent.p1().node()
resolutionparent = repo[succsotherp1].node()
else:
msg = _(b"skipping %s: have a different parent than %s "
b"(not handled yet)\n") % (divergent, other)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment