tests/test-merge6
author Martin Geisler <mg@lazybytes.net>
Sat, 05 Dec 2009 23:16:09 +0100
changeset 10020 d7c23f4a14c7
parent 4295 a74586023196
permissions -rwxr-xr-x
run-tests: install data files correctly In 68964567e406 we began installing some data files in PREFIX/share. When preparing to run the tests, run-tests.py uses --home="" in order to work around home being set in a ~/.pydistutils.cfg file. This somehow overwrites the --prefix option. The result was that the share/ directory was installed in the top of the Mercurial source tree.

#!/bin/sh

cat <<EOF > merge
import sys, os
print "merging for", os.path.basename(sys.argv[1])
EOF
HGMERGE="python ../merge"; export HGMERGE

mkdir A1
cd A1
hg init
echo This is file foo1 > foo
echo This is file bar1 > bar
hg add foo bar
hg commit -m "commit text" -d "1000000 0"

cd ..
hg clone A1 B1

cd A1
rm bar
hg remove bar
hg commit -m "commit test" -d "1000000 0"

cd ../B1
echo This is file foo22 > foo
hg commit -m "commit test" -d "1000000 0"

cd ..
hg clone A1 A2
hg clone B1 B2

cd A1
hg pull ../B1
hg merge
hg commit -m "commit test" -d "1000000 0"
echo bar should remain deleted.
hg manifest --debug

cd ../B2
hg pull ../A2
hg merge
hg commit -m "commit test" -d "1000000 0"
echo bar should remain deleted.
hg manifest --debug