Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4209:dbc3846c09a1
Merge with -stable, fix small test failure
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 14 Mar 2007 01:26:09 -0500 |
parents | ba51a8225a60 7e1c8a565a4f |
children | 0d51eb296fb9 |
comparison
equal
deleted
inserted
replaced
4203:bd9b84b9a84b | 4209:dbc3846c09a1 |
---|---|
491 stats = applyupdates(repo, action, wc, p2) | 491 stats = applyupdates(repo, action, wc, p2) |
492 | 492 |
493 if not partial: | 493 if not partial: |
494 recordupdates(repo, action, branchmerge) | 494 recordupdates(repo, action, branchmerge) |
495 repo.dirstate.setparents(fp1, fp2) | 495 repo.dirstate.setparents(fp1, fp2) |
496 if not branchmerge: | |
497 repo.dirstate.setbranch(p2.branch()) | |
496 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) | 498 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
497 if not branchmerge: | |
498 repo.opener("branch", "w").write(p2.branch() + "\n") | |
499 | 499 |
500 return stats | 500 return stats |
501 | 501 |