# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1551299538 -19800
# Node ID 29645d5ba3d91f15e40066569c052bd59174c60e
# Parent  2360a1e050a66d64724d16188736f6b12915e5f4
evolve: in pubdiv resolution make sure that transaction get closed

Before this patch it could be possible that transaction won't get
closed if res is False in the pubic divergence resolution when
continuing the hg evolve.

diff -r 2360a1e050a6 -r 29645d5ba3d9 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Feb 25 22:50:24 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Feb 28 02:02:18 2019 +0530
@@ -1903,11 +1903,13 @@
         if publicdiv:
             res, newnode = ret
             if not res:
-                return (res, newnode)
-            prec = repo[publicdiv]
-            bumped = repo[newnode]
-            ret = _resolvephasedivergent(ui, repo, prec=prec, bumped=bumped,
-                                         tmpctx=bumped)
+                # no need to proceed for phase divergence resolution step
+                pass
+            else:
+                prec = repo[publicdiv]
+                bumped = repo[newnode]
+                ret = _resolvephasedivergent(ui, repo, prec=prec,
+                                             bumped=bumped, tmpctx=bumped)
         tr.close()
         return ret
     finally: