view tests/test-mq-symlinks @ 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 f6c520fd70cf
children
line wrap: on
line source

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

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

for f in sys.argv[1:]:
    try:
        print f, '->', os.readlink(f)
    except OSError, err:
        if err.errno != errno.EINVAL: raise
        print f, 'not a symlink'
EOF

hg init
hg qinit
hg qnew base.patch
echo a > a
echo b > b
hg add a b
hg qrefresh
python readlink.py a

hg qnew symlink.patch
rm a
ln -s b a
hg qrefresh --git
python readlink.py a

hg qpop
hg qpush
python readlink.py a