1132             repo.vfs.write('updatestate', p2.hex())

  1132             repo.vfs.write('updatestate', p2.hex())

  1133 

  1133 

  1134         stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)

  1134         stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)

  1135 

  1135 

  1136         if not partial:

  1136         if not partial:

  1137             repo.setparents(fp1, fp2)

  1138             repo.setparents(fp1, fp2)

  1138             recordupdates(repo, actions, branchmerge)

  1139             recordupdates(repo, actions, branchmerge)

  1139             # update completed, clear state

  1140             # update completed, clear state

  1140             util.unlink(repo.join('updatestate'))

  1141             util.unlink(repo.join('updatestate'))

  1141 

  1142 

  1142             if not branchmerge:

  1143             if not branchmerge:

  1143                 repo.dirstate.setbranch(p2.branch())

  1144                 repo.dirstate.setbranch(p2.branch())

  1144     finally:

  1146     finally:

  1145         wlock.release()

  1147         wlock.release()

  1146 

  1148 

  1147     if not partial:

  1149     if not partial:

  1148         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])

  1150         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])