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