annotate tests/test-issue322 @ 3398:0f308690bda8

Fixed contrib/hgdiff script to pass diffopts in the new format.

#!/bin/sh
# http://www.selenic.com/mercurial/bts/issue322

echo % file replaced with directory

hg init a
cd a       
echo a > a 
hg commit -Ama 
rm a       
mkdir a    
echo a > a/a

echo % should fail - would corrupt dirstate
hg add a/a

cd ..      

echo % directory replaced with file

hg init c
cd c
mkdir a
echo a > a/a
hg commit -Ama

rm -rf a
echo a > a

echo % should fail - would corrupt dirstate
hg add a

cd ..

echo % directory replaced with file

hg init d
cd d
mkdir b
mkdir b/c
echo a > b/c/d
hg commit -Ama
rm -rf b
echo a > b

echo % should fail - would corrupt dirstate
hg add b

exit 0