tests/test-merge4
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 20 Feb 2006 01:12:03 +0100
changeset 1754 fdfe89a3962d
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
use repo.lock when cloning via copy, use lock.LockException when necessary

#!/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"