view tests/test-symlink-basic @ 5483:0c43f87baba3 default tip

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 25d753efd48e
children
line wrap: on
line source

#!/bin/sh

"$TESTDIR/hghave" symlink || exit 80

cleanpath()
{
    sed -e "s:/.*\(/test-symlink-basic/.*\):...\1:"
}

cat >> readlink.py <<EOF
import os
import sys

for f in sys.argv[1:]:
    print f, '->', os.readlink(f)
EOF

hg init a
cd a
ln -s nothing dangling
hg commit -m 'commit symlink without adding' -d '0 0' dangling 2>&1 | cleanpath
hg add dangling
hg commit -m 'add symlink' -d '0 0'

hg tip -v
hg manifest --debug
echo '% rev 0:'
python ../readlink.py dangling

rm dangling
ln -s void dangling
hg commit -m 'change symlink'
echo '% rev 1:'
python ../readlink.py dangling

echo '% modifying link'
rm dangling
ln -s empty dangling
python ../readlink.py dangling

echo '% reverting to rev 0:'
hg revert -r 0 -a
python ../readlink.py dangling

echo '% backups:'
python ../readlink.py *.orig

rm *.orig
hg up -C
echo '% copies'
hg cp -v dangling dangling2
hg st -Cmard
python ../readlink.py dangling dangling2