tests/test-merge4
author Christian Ebert <blacktrash@gmx.net>
Wed, 03 Oct 2007 21:01:47 +0200
changeset 5359 645a40777fd4
parent 2283 e506c14382fd
permissions -rwxr-xr-x
test-convert-cvs: handle older cvs client

#!/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 merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"