--- a/mercurial/repair.py Thu Nov 24 18:34:50 2016 -0800
+++ b/mercurial/repair.py Thu Nov 24 18:45:29 2016 -0800
@@ -918,6 +918,12 @@
'again\n'))
scmutil.writerequires(srcrepo.vfs, requirements)
+ # The lock file from the old store won't be removed because nothing has a
+ # reference to its new location. So clean it up manually. Alternatively, we
+ # could update srcrepo.svfs and other variables to point to the new
+ # location. This is simpler.
+ backupvfs.unlink('store/lock')
+
return backuppath
def upgraderepo(ui, repo, run=False, optimize=None):