# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1281390953 18000
# Node ID 6a5e159eb93ed120407e533bda4eceb0cf7f0435
# Parent  b0e3d3973440889da117b719097bb97fce36d918# Parent  423ece53380ee7cb475f9f429766757749f6a070
merge with stable

diff -r b0e3d3973440 -r 6a5e159eb93e tests/test-dispatch
--- a/tests/test-dispatch	Mon Aug 09 12:25:01 2010 -0500
+++ b/tests/test-dispatch	Mon Aug 09 16:55:53 2010 -0500
@@ -22,8 +22,8 @@
 hg cat a
 
 echo '% working directory removed'
-rm -rf $dir/a
-hg --version
+sh -c "cd $dir && rm -rf a"
+hg --version 2>&1 | sed -e 's,\(abort:.*:\).*$,\1 ...,g'
 
 echo '% no repo'
 cd $dir
diff -r b0e3d3973440 -r 6a5e159eb93e tests/test-dispatch.out
--- a/tests/test-dispatch.out	Mon Aug 09 12:25:01 2010 -0500
+++ b/tests/test-dispatch.out	Mon Aug 09 16:55:53 2010 -0500
@@ -34,6 +34,6 @@
 a
 a: No such file in rev 000000000000
 % working directory removed
-abort: error getting current working directory: No such file or directory
+abort: error getting current working directory: ...
 % no repo
 abort: There is no Mercurial repository here (.hg not found)!