This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit a05021d7 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

evolve: remove unnecessary condition

parent 4ce82a3aff94
......@@ -392,9 +392,9 @@ def _pickresolutionparent(ui, repo, divergent, other, evolvestate):
else:
# no extra cset on either side
pass
elif succsotherp1 == gca and succsdivp1 != gca:
elif succsotherp1 == gca:
pass
elif succsdivp1 == gca and succsotherp1 != gca:
elif succsdivp1 == gca:
resolutionparent = repo[succsotherp1].node()
else:
msg = _(b"skipping %s: have a different parent than %s "
......
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