Mercurial > evolve

changeset 5399:ad9b2d68a8ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove unnecessary code
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 22 Jun 2020 09:39:39 +0530
parents b3e178f3e31f
children 2c16855aa3fe
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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