487     if not partial:

   487     if not partial:

   488         recordupdates(repo, action, branchmerge)

   488         recordupdates(repo, action, branchmerge)

   489         repo.dirstate.setparents(fp1, fp2)

   489         repo.dirstate.setparents(fp1, fp2)

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

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

   491         if not branchmerge:

   491         if not branchmerge:

   493             repo.opener("branch", "w").write(p2.branch() + "\n")

   492             repo.opener("branch", "w").write(p2.branch() + "\n")

   494 

   493 

   495     return stats

   494     return stats

   496 

   495