diff --git a/tests/test-lock-badness.t b/tests/test-lock-badness.t --- a/tests/test-lock-badness.t +++ b/tests/test-lock-badness.t @@ -15,17 +15,17 @@ $ cat > testlock.py << EOF > from mercurial import error, registrar - > + > > cmdtable = {} > command = registrar.command(cmdtable) - > + > > def acquiretestlock(repo, releaseexc): > def unlock(): > if releaseexc: > raise error.Abort(b'expected release exception') > l = repo._lock(repo.vfs, b'testlock', False, unlock, None, b'test lock') > return l - > + > > @command(b'testlockexc') > def testlockexc(ui, repo): > testlock = acquiretestlock(repo, True) @@ -106,6 +106,12 @@ calling hook pre-update: hghook_pre-update.sleephalf waiting for lock on working directory of b held by process '*' on host '*' (glob) got lock after * seconds (glob) + + Another Mercurial process seems to be running in this repository, e.g. + an editor opened by 'hg commit'. Please make sure all processes + are terminated then try again. If it still fails, a Mercurial process + may have crashed in this repository earlier: + remove the file manually to continue. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat preup-stderr $ cat stdout @@ -123,6 +129,12 @@ calling hook pre-update: hghook_pre-update.sleephalf waiting for lock on working directory of b held by process '*' on host '*' (glob) got lock after * seconds (glob) + + Another Mercurial process seems to be running in this repository, e.g. + an editor opened by 'hg commit'. Please make sure all processes + are terminated then try again. If it still fails, a Mercurial process + may have crashed in this repository earlier: + remove the file manually to continue. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat preup-stderr $ cat stdout