Mercurial > public > mercurial-scm > hg-stable
diff mercurial/debugcommands.py @ 49139:ea98850a136e
merge with stable
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 19 Apr 2022 10:53:58 -0400 |
| parents | f054a557aab8 020378f32d57 |
| children | a932cad26d37 |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Fri Apr 15 11:20:49 2022 -0400 +++ b/mercurial/debugcommands.py Tue Apr 19 10:53:58 2022 -0400 @@ -2148,9 +2148,9 @@ """ if opts.get('force_free_lock'): - repo.svfs.unlink(b'lock') + repo.svfs.tryunlink(b'lock') if opts.get('force_free_wlock'): - repo.vfs.unlink(b'wlock') + repo.vfs.tryunlink(b'wlock') if opts.get('force_free_lock') or opts.get('force_free_wlock'): return 0