Mercurial > hg
view tests/test-conflict.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 | 2371f4aea665 |
line wrap: on
line source
$ hg init $ echo "nothing" > a $ hg add a $ hg commit -m ancestor $ echo "something" > a $ hg commit -m branch1 $ hg co 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "something else" > a $ hg commit -m branch2 created new head $ hg merge 1 merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ hg id 32e80765d7fe+75234512624c+ tip $ cat a <<<<<<< local something else ======= something >>>>>>> other $ hg status M a ? a.orig