view tests/test-merge4 @ 715:938dd667ca21

Make annotate use option --rev instead od --revision like other commands. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make annotate use option --rev instead od --revision like other commands. manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C PhOGWMHVlNYGZxmdXridIc4= =J7Cn -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 16 Jul 2005 07:58:56 +0100
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

#!/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