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.
#!/bin/sh
hg init
cat > .hg/hgrc <<EOF
[encode]
*.gz = gunzip
[decode]
*.gz = gzip
EOF
echo "this is a test" | gzip > a.gz
hg add a.gz
hg ci -m "test" -d "1000000 0"
echo %% no changes
hg status
touch a.gz
echo %% no changes
hg status
echo %% uncompressed contents in repo
hg debugdata .hg/store/data/a.gz.d 0
echo %% uncompress our working dir copy
gunzip < a.gz
rm a.gz
hg co
echo %% uncompress our new working dir copy
gunzip < a.gz