tests/test-merge4
author mpm@selenic.com
Fri, 01 Jul 2005 00:21:49 -0800
changeset 554 2f515dcfbc24
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Fix some linewrapping -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix some linewrapping manifest hash: 3be515e65adeb9652e646059fb6dc8d23b0a7a72 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxP0dywK+sNU5EO8RAoSCAJ9kOtNnkesCD/QplxujNJxvb8JJowCeJb0Q q58TYLTbZ8wnuFwagBABVds= =CN45 -----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