--- a/tests/test-bundle Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-bundle Tue Dec 26 14:54:48 2006 +0100
@@ -38,7 +38,7 @@
hg -R empty rollback
hg --cwd empty pull ../full.hg
-rm -rf empty
+rm -r empty
hg init empty
cd empty
hg -R bundle://../full.hg log
@@ -49,7 +49,7 @@
hg pull bundle://../full.hg
cd ..
-rm -rf empty
+rm -r empty
hg init empty
hg clone -r 3 test partial
hg clone partial partial2
--- a/tests/test-clone-failure Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-clone-failure Tue Dec 26 14:54:48 2006 +0100
@@ -23,7 +23,7 @@
echo $?
cd ..
chmod 700 a
-rm -rf a b
+rm -r a b
# Source of wrong type
mkfifo a
--- a/tests/test-command-template Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-command-template Tue Dec 26 14:54:48 2006 +0100
@@ -61,7 +61,7 @@
hg log --style ./t
echo '# include works'
-rm -f q
+rm q
echo '{rev}' > q
hg log --style ./t
--- a/tests/test-import Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-import Tue Dec 26 14:54:48 2006 +0100
@@ -18,30 +18,30 @@
hg --cwd b tip | grep 'second change'
echo % committer should be same
hg --cwd b tip | grep someone
-rm -rf b
+rm -r b
echo % import of plain diff should fail without message
hg clone -r0 a b
hg --cwd a diff -r0:1 > tip.patch
hg --cwd b import ../tip.patch
-rm -rf b
+rm -r b
echo % import of plain diff should be ok with message
hg clone -r0 a b
hg --cwd a diff -r0:1 > tip.patch
hg --cwd b import -mpatch ../tip.patch
-rm -rf b
+rm -r b
echo % import from stdin
hg clone -r0 a b
hg --cwd a export tip | hg --cwd b import -
-rm -rf b
+rm -r b
echo % override commit message
hg clone -r0 a b
hg --cwd a export tip | hg --cwd b import -m 'override' -
hg --cwd b tip | grep override
-rm -rf b
+rm -r b
cat > mkmsg.py <<EOF
import email.Message, sys
@@ -58,29 +58,29 @@
python mkmsg.py > msg.patch
hg --cwd b import ../msg.patch
hg --cwd b tip | grep email
-rm -rf b
+rm -r b
echo % plain diff in email, no subject, message body
hg clone -r0 a b
grep -v '^Subject:' msg.patch | hg --cwd b import -
-rm -rf b
+rm -r b
echo % plain diff in email, subject, no message body
hg clone -r0 a b
grep -v '^email ' msg.patch | hg --cwd b import -
-rm -rf b
+rm -r b
echo % plain diff in email, no subject, no message body, should fail
hg clone -r0 a b
egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
-rm -rf b
+rm -r b
echo % hg export in email, should use patch header
hg clone -r0 a b
hg --cwd a export tip > tip.patch
python mkmsg.py | hg --cwd b import -
hg --cwd b tip | grep second
-rm -rf b
+rm -r b
# bug non regression test
# importing a patch in a subdirectory failed at the commit stage
--- a/tests/test-incoming-outgoing Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-incoming-outgoing Tue Dec 26 14:54:48 2006 +0100
@@ -32,7 +32,7 @@
hg -R temp tip
hg -R temp2 tip
-rm -rf temp temp2 new
+rm -r temp temp2 new
# test outgoing
hg clone test test-dev
--- a/tests/test-issue322 Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-issue322 Tue Dec 26 14:54:48 2006 +0100
@@ -24,7 +24,7 @@
echo a > a/a
hg commit -Ama
-rm -rf a
+rm -r a
echo a > a
echo % should fail - would corrupt dirstate
@@ -40,7 +40,7 @@
mkdir b/c
echo a > b/c/d
hg commit -Ama
-rm -rf b
+rm -r b
echo a > b
echo % should fail - would corrupt dirstate
--- a/tests/test-locate Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-locate Tue Dec 26 14:54:48 2006 +0100
@@ -27,5 +27,5 @@
hg locate -I ../t
# test issue294
cd ..
-rm -rf t
+rm -r t
hg locate t
--- a/tests/test-manifest-merging Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-manifest-merging Tue Dec 26 14:54:48 2006 +0100
@@ -30,5 +30,5 @@
hg merge
echo % revert to changeset 1 to simulate a failed merge
-rm -f alpha beta gamma
+rm alpha beta gamma
hg up -C 1
--- a/tests/test-merge-revert Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-merge-revert Tue Dec 26 14:54:48 2006 +0100
@@ -41,5 +41,4 @@
hg diff
hg status
hg id
-cd ..; /bin/rm -rf t
--- a/tests/test-merge-revert2 Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-merge-revert2 Tue Dec 26 14:54:48 2006 +0100
@@ -42,5 +42,4 @@
hg diff
hg status
hg id
-cd ..; /bin/rm -rf t
--- a/tests/test-merge1 Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-merge1 Tue Dec 26 14:54:48 2006 +0100
@@ -25,7 +25,7 @@
env HGMERGE=../merge hg merge 1
hg diff --nodates
hg status
-cd ..; /bin/rm -rf t
+cd ..; rm -r t
mkdir t
cd t
@@ -48,7 +48,7 @@
env HGMERGE=../merge hg merge -f 1
hg diff --nodates
hg status
-cd ..; /bin/rm -rf t
+cd ..; rm -r t
echo %%
mkdir t
@@ -77,7 +77,7 @@
env HGMERGE=../merge hg merge -f 2
hg diff --nodates
hg status
-cd ..; /bin/rm -rf t
+cd ..; rm -r t
mkdir t
cd t
@@ -101,4 +101,3 @@
env HGMERGE=../merge hg merge -f 2
hg diff --nodates
hg status
-cd ..; /bin/rm -rf t
--- a/tests/test-merge2 Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-merge2 Tue Dec 26 14:54:48 2006 +0100
@@ -14,7 +14,7 @@
echo This is file b2 > b
hg add b
hg commit -m "commit #2" -d "1000000 0"
-cd ..; /bin/rm -rf t
+cd ..; rm -r t
mkdir t
cd t
@@ -29,7 +29,7 @@
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
-cd ..; /bin/rm -rf t
+cd ..; rm -r t
mkdir t
cd t
@@ -45,4 +45,3 @@
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
-cd ..; /bin/rm -rf t
--- a/tests/test-mq-caches Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-mq-caches Tue Dec 26 14:54:48 2006 +0100
@@ -61,7 +61,7 @@
echo
echo '# removing the cache'
-rm -f .hg/branches.cache
+rm .hg/branches.cache
show_branch_cache 1
echo
--- a/tests/test-rename-merge2 Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-rename-merge2 Tue Dec 26 14:54:48 2006 +0100
@@ -60,7 +60,7 @@
echo
cd ..
- rm -rf t
+ rm -r t
}
up() {
--- a/tests/test-revert Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-revert Tue Dec 26 14:54:48 2006 +0100
@@ -49,7 +49,7 @@
hg revert --all -r0
echo %% should forget a
hg revert --all -rtip
-rm -f a *.orig
+rm a *.orig
echo %% should silently add a
hg revert -r0 a
hg st a
--- a/tests/test-symlinks Tue Dec 26 03:29:45 2006 +0100
+++ b/tests/test-symlinks Tue Dec 26 14:54:48 2006 +0100
@@ -23,7 +23,7 @@
#Assert screamed here before, should go by without consequence
hg commit -m 'is there a bug?'
-cd .. ; rm -rf test
+cd .. ; rm -r test
hg init test; cd test;
mkdir dir