Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 10492:0e64d814d7d0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run commit and update hooks after command completion (issue1827) Previously, the working dir state hadn't been written when these hooks were invoked, so external commands couldn't see all changes.
author Sune Foldager <cryo@cyanite.org>
date Wed, 17 Feb 2010 15:43:21 +0100
parents ba5e508b5e92
children 7a0d096e221e
comparison
equal deleted inserted replaced
10491:d7e582cab6b6 10492:0e64d814d7d0
509 if not partial: 509 if not partial:
510 recordupdates(repo, action, branchmerge) 510 recordupdates(repo, action, branchmerge)
511 repo.dirstate.setparents(fp1, fp2) 511 repo.dirstate.setparents(fp1, fp2)
512 if not branchmerge and not fastforward: 512 if not branchmerge and not fastforward:
513 repo.dirstate.setbranch(p2.branch()) 513 repo.dirstate.setbranch(p2.branch())
514 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
515
516 return stats
517 finally: 514 finally:
518 wlock.release() 515 wlock.release()
516
517 if not partial:
518 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
519 return stats