view tests/test-merge4 @ 501:7ea1c88792bf

Better messages for rollback and undo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Better messages for rollback and undo manifest hash: 22eeb8848b0e07e1f23a896b03c37f7d6f4bd82d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSBtywK+sNU5EO8RAhNEAJ9MGJxgZjIKegh1TA7++wGbAzkovACgqL3I k1ii4X5PEWEDcoyOp0VqJn4= =wzlT -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 02:03:25 -0800
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