# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1597953513 -19800
# Node ID 2f78cb38620f373ab122cf28632bd3ddce6de52d
# Parent  b4c2cbbde6bdbf576ebf9895816c7e3aad7e7784
evolve: move a line a code block above

diff -r b4c2cbbde6bd -r 2f78cb38620f hgext3rd/evolve/evolvecmd.py
--- 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)