# HG changeset patch # User Sushil khanchi # Date 1592798979 -19800 # Node ID ad9b2d68a8eeceb0b84d9645a423402cb311c902 # Parent b3e178f3e31fb77e8aa2654d611bf8e8d6685372 evolve: remove unnecessary code diff -r b3e178f3e31f -r ad9b2d68a8ee hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Wed Jul 08 22:41:20 2020 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Mon Jun 22 09:39:39 2020 +0530 @@ -287,7 +287,6 @@ def _prepcontentdivresolution(ui, repo, divergent, other, evolvestate): """ if relocation required, decide which divergent cset will be relocated to the other side""" - divergent = repo[divergent.rev()] evolvestate[b'divergent'] = divergent.node() evolvestate[b'orig-divergent'] = divergent.node() # sometimes we will relocate a node in case of different parents and we can