# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1150414703 25200
# Node ID cc1011a7ed09e30ba62a863fbd2e02dede03beba
# Parent  a765f853439d44ff765e75adcef2d7b492b08d3c# Parent  e8c4f3d3df8c461d4868268c3faeda9639a9a902
merge with self.

diff --git a/mercurial/sshrepo.py b/mercurial/sshrepo.py
diff --git a/tests/test-bad-pull b/tests/test-bad-pull
--- a/tests/test-bad-pull
+++ b/tests/test-bad-pull
@@ -19,7 +19,8 @@ EOF
 
 python dumb.py 2>/dev/null &
 
-http_proxy= hg clone http://localhost:20059/foo copy2
+http_proxy= hg clone http://localhost:20059/foo copy2 2>&1 | \
+    sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
 echo $?
 
 kill $!
diff --git a/tests/test-bad-pull.out b/tests/test-bad-pull.out
--- a/tests/test-bad-pull.out
+++ b/tests/test-bad-pull.out
@@ -1,5 +1,9 @@
 abort: error: Connection refused
 255
 copy: No such file or directory
-abort: HTTP Error 404: File not found
-255
+abort: HTTP Error 404
+Date:
+Content-Type: text/html
+Connection: close
+
+0