Mercurial > hg > evolve

changeset 4519:29645d5ba3d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Thu, 28 Feb 2019 02:02:18 +0530
parents 2360a1e050a6
children 29733c2b0fd3
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py
+++ b/hgext3rd/evolve/evolvecmd.py
@@ -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: