changeset 3248 | 7a0d70b69d74 |
parent 3240 | 8d4855fd9d7b |
child 3254 | 751840e739a1 |
--- 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")),