tests/test-filelog.py.out
author Mads Kiilerich <mads@kiilerich.com>
Tue, 08 Jan 2013 04:15:41 +0100
changeset 18256 d084df89d948
parent 16498 d76ba2090e0c
permissions -rw-r--r--
merge: make internal merge fail cleanly on symlinks Simplemerge is not symlink aware and will never do the the right thing on symlinks. It would read the symlink as a file and abort with 'No such file or directory' on dangling symlinks. Instead, internal:merge now simply fails to merge symlinks.

ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
OK.