Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3248: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
comparison
equal deleted inserted replaced
3246:27139167e615 3248:7a0d70b69d74
377 377
378 updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2) 378 updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)
379 379
380 # update dirstate 380 # update dirstate
381 if not partial: 381 if not partial:
382 recordupdates(repo, action, branchmerge)
382 repo.dirstate.setparents(p1.node(), p2.node()) 383 repo.dirstate.setparents(p1.node(), p2.node())
383 recordupdates(repo, action, branchmerge)
384 384
385 if show_stats: 385 if show_stats:
386 stats = ((updated, _("updated")), 386 stats = ((updated, _("updated")),
387 (merged - unresolved, _("merged")), 387 (merged - unresolved, _("merged")),
388 (removed, _("removed")), 388 (removed, _("removed")),