Mercurial > hg
view tests/test-update-issue1456.t @ 13475:c7bef25ca393 stable
eol: handle LockUnavailable error (issue2569)
If the repository is not locked when clearing the dirstate, then
running test-eol.t in a loop fails sooner or later with:
ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed
--- /home/mg/src/mercurial-crew/tests/test-eol.t
+++ /home/mg/src/mercurial-crew/tests/test-eol.t.err
@@ -343,6 +343,7 @@
% hg status (eol activated)
M win.txt
% hg commit
+ nothing changed
% hg status
$ testmixed CRLF
However, if we cannot lock the repository, then we can also not make a
commit and so we can simply ignore a LockUnavailable error.
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Fri, 25 Feb 2011 12:32:15 +0100 |
parents | 4134686b83e1 |
children | db0340f4b507 |
line wrap: on
line source
$ rm -rf a $ hg init a $ cd a $ echo foo > foo $ hg ci -qAm0 $ chmod +x foo $ hg ci -m1 $ hg co -q 0 $ echo dirty > foo $ hg up -c abort: uncommitted local changes [255] $ hg up -q $ cat foo dirty $ hg st -A M foo Validate update of standalone execute bit change: $ hg up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ chmod -x foo $ hg ci -m removeexec nothing changed [1] $ hg up -C 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg st