Mercurial > evolve
changeset 5817:17076fdc8074
evolve: drop unnecessary variables (follow-up of a9ad01ed1539)
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Mon, 01 Feb 2021 23:56:34 +0530 |
parents | a1dad44fe3da |
children | 524eb673ac52 |
files | hgext3rd/evolve/evolvecmd.py |
diffstat | 1 files changed, 0 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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: #