# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1159988966 18000
# Node ID 7a0d70b69d742ce52f9f0bf7c67f977aba2a3e40
# Parent  27139167e615cf474539f3d563b9710d8b47bc78
merge: reorder dirstate update slightly for correctness

diff -r 27139167e615 -r 7a0d70b69d74 mercurial/merge.py
--- a/mercurial/merge.py	Wed Oct 04 11:14:33 2006 -0700
+++ b/mercurial/merge.py	Wed Oct 04 14:09:26 2006 -0500
@@ -379,8 +379,8 @@
 
     # 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")),