equal
deleted
inserted
replaced
475 if not partial: |
475 if not partial: |
476 recordupdates(repo, action, branchmerge) |
476 recordupdates(repo, action, branchmerge) |
477 repo.dirstate.setparents(fp1, fp2) |
477 repo.dirstate.setparents(fp1, fp2) |
478 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
478 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
479 if not branchmerge: |
479 if not branchmerge: |
|
480 b = util.tolocal(p2.branch()) |
480 repo.opener("branch", "w").write(p2.branch() + "\n") |
481 repo.opener("branch", "w").write(p2.branch() + "\n") |
481 |
482 |
482 return stats |
483 return stats |
483 |
484 |