# HG changeset patch # User Sushil khanchi # Date 1577644860 -19800 # Node ID 4a9f9cd7a0abeebdaa9f978cad6a10119f290270 # Parent 8b7da5df5c7f80184f34d328c7fb1a1d5e942bcc evolve: remove duplicated code See at line 500. diff -r 8b7da5df5c7f -r 4a9f9cd7a0ab hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Mon Nov 25 02:41:16 2019 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Mon Dec 30 00:11:00 2019 +0530 @@ -498,7 +498,7 @@ divergent, other, resolutionparent, relocatereq = datatoproceed[1:] if relocatereq: - evolvestate['relocation-req'] = True + evolvestate[b'relocation-req'] = True evolvestate[b'resolutionparent'] = resolutionparent if not ui.quiet or confirm: @@ -520,10 +520,6 @@ ui.write((b'hg commit -m "`hg log -r %s --template={desc}`";\n' % divergent)) return (False, b".") - - if relocatereq: - evolvestate[b'relocation-req'] = True - evolvestate[b'resolutionparent'] = resolutionparent try: succsdivp1 = utility._singlesuccessor(repo, divergent.p1()) except utility.MultipleSuccessorsError: