Commit 3024054a authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

evolve: simplify some conditional

extracted from a changeset of Sushil khanchi <>
parent 1403cc7c2cee
......@@ -377,8 +377,8 @@ def _solvedivergent(ui, repo, divergent, evolvestate, displayer, dryrun=False,
return (False, b".")
succsotherp1 = other.p1().rev()
succsdivp1 = divergent.p1().rev()
otherp1 = succsotherp1 = other.p1().rev()
divp1 = succsdivp1 = divergent.p1().rev()
# finding single successors of otherp1 and divp1
......@@ -431,7 +431,7 @@ def _solvedivergent(ui, repo, divergent, evolvestate, displayer, dryrun=False,
# then solve the content-divergence the way we solve 1)
# for 3) and 4), we still have to decide
if succsotherp1 in gca and succsdivp1 in gca:
if succsotherp1 == other.p1().rev() and succsdivp1 == divergent.p1().rev():
if succsotherp1 == otherp1 and succsdivp1 == divp1:
# both are on the same parents
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