view tests/test-pull @ 703:fb6f85ecc863

merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 17:28:19 +0100
parents 5d6177b72fcc
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -t "1"
hg verify
hg serve -p 20059 > /dev/null &
cd ..

hg clone http://localhost:20059/ copy
cd copy
hg verify
hg co
cat foo
hg manifest
hg pull

kill $!