# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1159992423 -7200
# Node ID 168485fa44ba3abadd5db3ea8a56fd3c62698170
# Parent  1e2941fda520c5f2e059c81835d12b4b1bda9856# Parent  7a0d70b69d742ce52f9f0bf7c67f977aba2a3e40
merge with upstream

diff -r 1e2941fda520 -r 168485fa44ba mercurial/merge.py
--- a/mercurial/merge.py	Wed Oct 04 12:39:51 2006 -0700
+++ b/mercurial/merge.py	Wed Oct 04 22:07:03 2006 +0200
@@ -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")),