author | Thomas Arendsen Hein <thomas@intevation.de> |
Wed, 04 Oct 2006 22:07:03 +0200 | |
changeset 3249 | 168485fa44ba |
parent 3247 | 1e2941fda520 (current diff) |
parent 3248 | 7a0d70b69d74 (diff) |
child 3253 | 03acd01520ac |
--- 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")),