tests/test-merge4
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 28 Jun 2005 07:05:55 +0100
changeset 494 6020bde714e4
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Fixed test for previous change of 'hg -v history'. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test for previous change of 'hg -v history'. manifest hash: 5a7d918645596751577b95d0dfba28fd70274b48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOjDW7P1GVgWeRoRAvL7AJwO27B6qhOZZC+16SPjIxJBKz3BSwCghmkB OMzLY0CjZSHixF5xs0ZU6Dw= =F04F -----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