# HG changeset patch # User Sushil khanchi # Date 1612203994 -19800 # Node ID 17076fdc8074342b22bc8c980ce2fb998dd050e6 # Parent a1dad44fe3da7c6790bfcf2bf6c71e753c074d5e evolve: drop unnecessary variables (follow-up of a9ad01ed1539) diff -r a1dad44fe3da -r 17076fdc8074 hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Wed Mar 03 10:57:09 2021 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Mon Feb 01 23:56:34 2021 +0530 @@ -345,18 +345,6 @@ # the changeset on which resolution changeset will be based on resolutionparent = succsdivp1 - # divonly: non-obsolete csets which are topological ancestor of "divergent" - # but not "other" - divonly = repo.revs(b"only(%d, %d) - obsolete()" % (divergent.rev(), - other.rev())) - # otheronly: non-obsolete csets which are topological ancestor of "other" - # but not "div" - otheronly = repo.revs(b"only(%d, %d) - obsolete()" % (other.rev(), - divergent.rev())) - # make it exclusive set - divonly = set(divonly) - {divergent.rev()} - otheronly = set(otheronly) - {other.rev()} - # testing how both the divergent changesets are arranged, there can be 4 # possible cases here: #