diff mercurial/merge.py @ 10492:0e64d814d7d0 stable

run commit and update hooks after command completion (issue1827)

Previously, the working dir state hadn't been written when these
hooks were invoked, so external commands couldn't see all changes.

--- a/mercurial/merge.py	Wed Feb 17 11:00:48 2010 +0100
+++ b/mercurial/merge.py	Wed Feb 17 15:43:21 2010 +0100
@@ -511,8 +511,9 @@
             repo.dirstate.setparents(fp1, fp2)
             if not branchmerge and not fastforward:
                 repo.dirstate.setbranch(p2.branch())
-            repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
-
-        return stats
     finally:
         wlock.release()
+
+    if not partial:
+        repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
+    return stats