Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/upgrade_utils/engine.py @ 46796:e2f7b2695ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 18 Mar 2021 18:24:59 -0400
parents 6266d19556ad 8da44c36fc74
children 6085b7f1536d
comparison
equal deleted inserted replaced
46795:6b52cffd8d0a 46796:e2f7b2695ba1
579 if upgrade_op.backup_store: 579 if upgrade_op.backup_store:
580 # The lock file from the old store won't be removed because nothing has a 580 # The lock file from the old store won't be removed because nothing has a
581 # reference to its new location. So clean it up manually. Alternatively, we 581 # reference to its new location. So clean it up manually. Alternatively, we
582 # could update srcrepo.svfs and other variables to point to the new 582 # could update srcrepo.svfs and other variables to point to the new
583 # location. This is simpler. 583 # location. This is simpler.
584 assert backupvfs is not None # help pytype
584 backupvfs.unlink(b'store/lock') 585 backupvfs.unlink(b'store/lock')
585 586
586 return backuppath 587 return backuppath