view tests/test-commit-copy @ 5503:6f26c7677463

Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.

#!/bin/sh

hg init dir
cd dir
echo bleh > bar
hg add bar
hg ci -m 'add bar'

hg cp bar foo
echo >> bar
hg ci -m 'cp bar foo; change bar'

hg debugrename foo
hg debugindex .hg/store/data/bar.i