Mercurial > hg > mercurial-crew-with-dirclash
changeset 3248:7a0d70b69d74
merge: reorder dirstate update slightly for correctness
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 04 Oct 2006 14:09:26 -0500 |
parents | 27139167e615 |
children | 168485fa44ba 751840e739a1 |
files | mercurial/merge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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")),