view tests/test-diff-newlines @ 2953:3d5547845158

fix issue 322.
do not allow to add files that shadow files or directories already in dirstate.

#!/bin/sh

hg init
python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
hg ci -Ama -d '1 0'
echo clean diff >> a
hg ci -mb -d '2 0'
hg diff -r0 -r1