mercurial-crew-with-dirclash: tests/test-merge2@2d2fee33ec68

author	Thomas Arendsen Hein <thomas@intevation.de>
	Wed, 10 Aug 2005 08:41:23 +0100
changeset 865	2d2fee33ec68
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x

Cleanup after previous changes: - there are only two states for the exec bit, so no need to override it. - file_ variable is only once now, so it self.file(f) can be used directly.


#!/bin/sh

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