# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-10-04 19:09:26
# Node ID 7a0d70b69d742ce52f9f0bf7c67f977aba2a3e40
# Parent  27139167e615cf474539f3d563b9710d8b47bc78

merge: reorder dirstate update slightly for correctness

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -379,8 +379,8 @@ def update(repo, node, branchmerge=False
 
     # update dirstate
     if not partial:
+        recordupdates(repo, action, branchmerge)
         repo.dirstate.setparents(p1.node(), p2.node())
-        recordupdates(repo, action, branchmerge)
 
     if show_stats:
         stats = ((updated, _("updated")),