# HG changeset patch # User Kyle Lippincott # Date 1587501465 25200 # Node ID a9ff0742c8ea8984f12d462b40195bf229385a01 # Parent ea9563e9e65a195ae3d54b8c2143d0fd002dc792 locking: wait for locks in `hg cp` and `hg mv` I traced this back to revision 1822 (64df422), and there's no explanation why we would prefer to error out instead of waiting for the locks. Differential Revision: https://phab.mercurial-scm.org/D8464 diff -r ea9563e9e65a -r a9ff0742c8ea mercurial/commands.py --- a/mercurial/commands.py Tue Apr 14 05:37:54 2020 +0200 +++ b/mercurial/commands.py Tue Apr 21 13:37:45 2020 -0700 @@ -2350,7 +2350,7 @@ Returns 0 on success, 1 if errors are encountered. """ opts = pycompat.byteskwargs(opts) - with repo.wlock(False): + with repo.wlock(): return cmdutil.copy(ui, repo, pats, opts) @@ -5807,7 +5807,7 @@ Returns 0 on success, 1 if errors are encountered. """ opts = pycompat.byteskwargs(opts) - with repo.wlock(False): + with repo.wlock(): return cmdutil.copy(ui, repo, pats, opts, rename=True)