view tests/test-symlink-basic @ 5149:ad6b97132b81

merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 12 Aug 2007 12:15:10 -0300
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