mercurial/commands.py
changeset 45164 7f41e824a02b
parent 45134 487df3676d2c
child 45369 5178dd2233d0
--- a/mercurial/commands.py	Thu Jul 09 17:05:41 2020 +0530
+++ b/mercurial/commands.py	Thu Jul 09 18:20:54 2020 +0530
@@ -6129,7 +6129,8 @@
                     raise
 
         ms.commit()
-        ms.recordactions()
+        branchmerge = repo.dirstate.p2() != nullid
+        mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
 
         if not didwork and pats:
             hint = None