--- a/hgext3rd/evolve/evolvecmd.py	Mon Mar 12 15:41:51 2018 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Mar 19 12:58:31 2018 +0530
@@ -1208,8 +1208,8 @@
                 # directory parent should be successor of p2, so we should
                 # set dirstate parents to (succ of p2, p1)
                 with repo.dirstate.parentchange():
-                    repo.dirstate.setparents(currentp1,
-                                             ctxparents[0].node())
+                    repo.dirstate.setparents(ctxparents[0].node(),
+                                             currentp1)
 
             else:
                 # both the parents were obsolete, not sure what logic will