Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: reorder dirstate update slightly for correctness
authorMatt Mackall <mpm@selenic.com>
Wed, 04 Oct 2006 14:09:26 -0500
changeset 3247 7a0d70b69d74
parent 3246 27139167e615
child 3248 751840e739a1
child 3254 168485fa44ba
merge: reorder dirstate update slightly for correctness
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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")),
Mercurial