tests/test-merge4
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 05 Apr 2006 15:39:48 +0200
changeset 2048 8f9660c568b8
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
Set correct exception for another possible malloc error in mpatch.c

#!/bin/sh

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