Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 3247:7a0d70b69d74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: reorder dirstate update slightly for correctness
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 14:09:26 -0500
parents 8d4855fd9d7b
children 751840e739a1
line wrap: on
line diff
--- 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")),