view tests/test-unrelated-pull @ 712:b4f0fad0ea64

Merge with myself. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with myself. manifest hash: e47e1ba87ecb28a08f819401fd8c2a88bc830261 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh ka6ciaH1pQLhOyKgqdbqwOA= =pOV4 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 15 Jul 2005 13:42:19 +0100
parents ffeb2c3a1966
children 7e4843b7efd2
line wrap: on
line source

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -t "a" -u a -d "0 0"

cd ..
mkdir b
cd b
hg init 
echo 321 > b
hg add b
hg commit -t "b" -u b -d "0 0"

hg pull ../a
hg heads