tests/test-merge4
author mpm@selenic.com
Thu, 21 Jul 2005 15:05:17 -0500
changeset 749 7e4843b7efd2
parent 416 5e9e8b8d2629
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05

#!/bin/sh -x

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