tests/test-merge4
author Peter van Dijk <peter@dataloss.nl>
Wed, 22 Feb 2006 16:11:17 +0100
changeset 1927 397b62d5dd13
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
add http_proxy= lines to test-bad-pull and test-pull

#!/bin/sh

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"