sync with stable

tests/test-bundle

@@ -38,7 +38,7 @@ hg --cwd empty pull ../full.hg
 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 @@ echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc
 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

tests/test-clone-failure

@@ -23,7 +23,7 @@ hg clone . ../a
 echo $?
 cd ..
 chmod 700 a
-rm -rf a b
+rm -r a b
 
 # Source of wrong type
 mkfifo a

tests/test-command-template

@@ -61,7 +61,7 @@ echo 'changeset = q' >> t
 hg log --style ./t
 
 echo '# include works'
-rm -f q
+rm q
 echo '{rev}' > q
 hg log --style ./t
 

tests/test-import

@@ -18,30 +18,30 @@ echo % message should be same
 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 @@ hg --cwd a diff -r0:1 > tip.patch
 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

tests/test-incoming-outgoing

@@ -32,7 +32,7 @@ hg -R temp2 unbundle test2.hg
 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

tests/test-issue322

@@ -24,7 +24,7 @@ mkdir a
 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
 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

tests/test-locate

@@ -27,5 +27,5 @@ hg locate
 hg locate -I ../t
 # test issue294
 cd ..
-rm -rf t
+rm -r t
 hg locate t

tests/test-manifest-merging

@@ -30,5 +30,5 @@ hg pull -q
 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

tests/test-merge-revert

@@ -41,5 +41,4 @@ hg update -C
 hg diff
 hg status
 hg id
-cd ..; /bin/rm -rf t
 

tests/test-merge-revert2

@@ -42,5 +42,4 @@ hg update -C
 hg diff
 hg status
 hg id
-cd ..; /bin/rm -rf t
 

tests/test-merge1

@@ -25,7 +25,7 @@ echo %% no merges expected
 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 @@ echo %% merge of b expected
 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 @@ echo %% merge expected!
 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 @@ echo %% merge of b expected
 env HGMERGE=../merge hg merge -f 2
 hg diff --nodates
 hg status
-cd ..; /bin/rm -rf t

tests/test-merge2

@@ -14,7 +14,7 @@ hg update 0
 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 @@ rm b
 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 remove b
 hg update 0
 echo This is file b2 > b
 hg commit -A -m "commit #2" -d "1000000 0"
-cd ..; /bin/rm -rf t

tests/test-mq-caches

@@ -61,7 +61,7 @@ show_branch_cache 1
 
 echo
 echo '# removing the cache'
-rm -f .hg/branches.cache
+rm .hg/branches.cache
 show_branch_cache 1
 
 echo

tests/test-rename-merge2

@@ -60,7 +60,7 @@ tm()
     echo
 
     cd ..
-    rm -rf t
+    rm -r t
 }
 
 up() { 

tests/test-revert

@@ -49,7 +49,7 @@ echo %% should add a, forget z
 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

tests/test-symlinks

@@ -23,7 +23,7 @@ hg addremove
 #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