Mercurial > evolve
changeset 5322:7295f3fa8e83
evolve: remove duplicated code
See at line 500.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Mon, 30 Dec 2019 00:11:00 +0530 |
| parents | aca6bdd2ca22 |
| children | 1208f8275b8b |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Sat May 09 22:20:30 2020 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Mon Dec 30 00:11:00 2019 +0530 @@ -493,7 +493,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: @@ -515,10 +515,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: