Mercurial > evolve
changeset 5577:2f78cb38620f
evolve: move a line a code block above
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 21 Aug 2020 01:28:33 +0530 |
parents | b4c2cbbde6bd |
children | b0234a269f29 |
files | hgext3rd/evolve/evolvecmd.py |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Fri Aug 21 01:27:58 2020 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Fri Aug 21 01:28:33 2020 +0530 @@ -481,14 +481,13 @@ other, evolvestate) if not picked: return (False, b".") + evolvestate[b'resolutionparent'] = resolutionparent if divergent.p1().node() != resolutionparent: evolvestate[b'relocate-div'] = True if other.p1().node() != resolutionparent: evolvestate[b'relocate-other'] = True - evolvestate[b'resolutionparent'] = resolutionparent - if not ui.quiet or confirm: ui.write(_(b'merge:'), label=b'evolve.operation') displayer.show(divergent)