Work-around failing tests/test-bad-pull with slow bg process.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Work-around failing tests/test-bad-pull with slow bg process.
Without the 'sleep 2' python dumb.py often appeared after hg clone.
manifest hash: b32381ac46a7691f2a92595b650b2406853644c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCxOM+W7P1GVgWeRoRAjgTAJ9OqrikdK043Eiyyx9dG8DR1XZ7tgCggdmM
AVYvAZO3P+WlaWDu3MaxEXY=
=0XN5
-----END PGP SIGNATURE-----
#!/bin/sh
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status