##// END OF EJS Templates
make commit fail when committing unresolved files
make commit fail when committing unresolved files

File last commit:

r4659:7a7d4937 default
r6888:7c36a4fb default
Show More
test-issue322
49 lines | 578 B | text/plain | TextLexer
Vadim Gelfer
add test for issue 322....
r2946 #!/bin/sh
# http://www.selenic.com/mercurial/bts/issue322
Vadim Gelfer
add other dir/file case to test for issue322.
r2949 echo % file replaced with directory
Vadim Gelfer
add test for issue 322....
r2946 hg init a
Thomas Arendsen Hein
Kill trailing spaces
r4659 cd a
echo a > a
hg commit -Ama
rm a
mkdir a
Vadim Gelfer
add test for issue 322....
r2946 echo a > a/a
Vadim Gelfer
add other dir/file case to test for issue322.
r2949 echo % should fail - would corrupt dirstate
Vadim Gelfer
add test for issue 322....
r2946 hg add a/a
Vadim Gelfer
add other dir/file case to test for issue322.
r2949
Thomas Arendsen Hein
Kill trailing spaces
r4659 cd ..
Vadim Gelfer
add test for issue 322....
r2946
Vadim Gelfer
add other dir/file case to test for issue322.
r2949 echo % directory replaced with file
hg init c
cd c
mkdir a
echo a > a/a
hg commit -Ama
Thomas Arendsen Hein
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
r3988 rm -r a
Vadim Gelfer
add other dir/file case to test for issue322.
r2949 echo a > a
echo % should fail - would corrupt dirstate
hg add a
Vadim Gelfer
fix issue 322....
r2953 cd ..
echo % directory replaced with file
Vadim Gelfer
add other dir/file case to test for issue322.
r2949
Vadim Gelfer
fix issue 322....
r2953 hg init d
cd d
mkdir b
mkdir b/c
echo a > b/c/d
hg commit -Ama
Thomas Arendsen Hein
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
r3988 rm -r b
Vadim Gelfer
fix issue 322....
r2953 echo a > b
echo % should fail - would corrupt dirstate
hg add b
exit 0