594             repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)

   594             repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)

   595 

   595 

   596         stats = applyupdates(repo, action, wc, p2, pa, overwrite)

   596         stats = applyupdates(repo, action, wc, p2, pa, overwrite)

   597 

   597 

   598         if not partial:

   598         if not partial:

   600             recordupdates(repo, action, branchmerge)

   600             recordupdates(repo, action, branchmerge)

   601             if not branchmerge:

   601             if not branchmerge:

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

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

   603     finally:

   603     finally:

   604         wlock.release()

   604         wlock.release()