Mercurial > hg
view tests/test-merge-types.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 | 28e2e3804f2e |
children | e0348815e806 |
line wrap: on
line source
$ hg init $ echo a > a $ hg ci -Amadd adding a $ chmod +x a $ hg ci -mexecutable $ hg up 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm a $ ln -s symlink a $ hg ci -msymlink created new head $ hg merge --debug searching for copies back to rev 1 resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e updating: a 1/1 files (100.00%) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Symlink is local parent, executable is other: $ if [ -h a ]; then > echo a is a symlink > $TESTDIR/readlink.py a > elif [ -x a ]; then > echo a is executable > else > echo "a has no flags (default for conflicts)" > fi a has no flags (default for conflicts) $ hg update -C 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug searching for copies back to rev 1 resolving manifests overwrite None partial False ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g updating: a 1/1 files (100.00%) getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Symlink is other parent, executable is local: $ if [ -h a ]; then > echo a is a symlink > $TESTDIR/readlink.py a > elif [ -x a ]; then > echo a is executable > else > echo "a has no flags (default for conflicts)" > fi a has no flags (default for conflicts)