tests/test-merge4
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Jun 2005 14:18:23 +0100
changeset 481 2705d20f77c9
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
hg import checking for quiet mode didn't work. Fixed using the ui module. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import checking for quiet mode didn't work. Fixed using the ui module. manifest hash: 3418ba604188b5abb2554615aff0ae59f4fee882 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqsfW7P1GVgWeRoRAjWVAJ9eNW+GnTJGvXMLxr1uPy5wM40gcQCeP6QO 7qW+m8/YmXLLi+vn2ETyWrM= =UGui -----END PGP SIGNATURE-----

#!/bin/sh -x

hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
hg update 0
echo This is file c1 > c
hg add c
hg commit -t "commit #2" -d "0 0" -u user
hg update -m 1
rm b
echo This is file c22 > c
hg commit -t "commit #3" -d "0 0" -u user