Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 19482:499fc471296b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add tracking of interrupted updates (issue3113) This takes advantage of the new checkunfinished infrastructure
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jul 2013 00:33:28 -0500
parents feaf5749d7a4
children 76df01e56e7f
comparison
equal deleted inserted replaced
19481:ee1af0f33d0e 19482:499fc471296b
745 ### apply phase 745 ### apply phase
746 if not branchmerge: # just jump to the new rev 746 if not branchmerge: # just jump to the new rev
747 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' 747 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
748 if not partial: 748 if not partial:
749 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) 749 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
750 # note that we're in the middle of an update
751 repo.vfs.write('updatestate', p2.hex())
750 752
751 stats = applyupdates(repo, actions, wc, p2, pa, overwrite) 753 stats = applyupdates(repo, actions, wc, p2, pa, overwrite)
752 754
753 if not partial: 755 if not partial:
754 repo.setparents(fp1, fp2) 756 repo.setparents(fp1, fp2)
755 recordupdates(repo, actions, branchmerge) 757 recordupdates(repo, actions, branchmerge)
758 # update completed, clear state
759 util.unlink(repo.join('updatestate'))
760
756 if not branchmerge: 761 if not branchmerge:
757 repo.dirstate.setbranch(p2.branch()) 762 repo.dirstate.setbranch(p2.branch())
758 finally: 763 finally:
759 wlock.release() 764 wlock.release()
760 765