Tidy up conflict and pull tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Tidy up conflict and pull tests
Fix failure to kill hg serve process and pipeline ordering with set -e
manifest hash:
eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg
pI3IH2BvqUlckdLwx3M5jcQ=
=s/QA
-----END PGP SIGNATURE-----
#!/bin/bash
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -t "1"
hg verify
hg serve -p 20059 2>/dev/null &
cd ..
mkdir copy
cd copy
hg init http://localhost:20059/
hg verify
hg co
cat foo
hg manifest
kill %hg