equal
deleted
inserted
replaced
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 |