tests/test-merge2
author Brendan Cully <brendan@kublai.com>
Wed, 02 Aug 2006 15:07:37 -0700
changeset 2771 519bf0cd28d2
parent 1933 7544700fd931
child 3988 9dcf9d45cab8
permissions -rwxr-xr-x
Add -f option to qfold; improve qfold documentation.

#!/bin/sh

mkdir t
cd t
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"
rm b
hg update 0
echo This is file b2 > b
hg add b
hg commit -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
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"
rm b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
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"
rm b
hg remove b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t