[MERGE] (fixes 241133)Trivial UI change in smart/message.py

[Neil Martinsen-Burrell]

Aaron Bentley <aaron <at> aaronbentley.com> writes:

> 
> Aaron Bentley has voted resubmit.
> Status is now: Resubmit
> Comment:
> This patch doesn't have correct spacing.  The message would read:
> 
> please check your connection to the network andthe file permissions on 
> the server.
> 
> For details, see: 
> http://bundlebuggy.aaronbentley.com/request/%3C485D50DD.3060002%40wartburg.edu%3E

Fixed.

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nmb at wartburg.edu-20080623002321-awblq1e9jftwnyao
# target_branch: ../../../bzr.dev/
# testament_sha1: 282902bfe1e43a6ca07663e0a9892bdab02727bd
# timestamp: 2008-06-22 19:23:47 -0500
# base_revision_id: pqm at pqm.ubuntu.com-20080620010918-64z4xylh1ap5hgyf
# 
# Begin patch
=== modified file 'bzrlib/smart/message.py'
--- bzrlib/smart/message.py     2008-06-01 23:08:22 +0000
+++ bzrlib/smart/message.py     2008-06-23 00:23:21 +0000
@@ -243,8 +243,8 @@
                     self._protocol_decoder._in_buffer[:10],
                     self._protocol_decoder.state_accept.__name__)
             raise errors.ConnectionReset(
-                "please check connectivity and permissions",
-                "(and try -Dhpss if further diagnosis is required)")
+                "please check your connection to the network and",
+                " the file permissions on the server.")
         self._protocol_decoder.accept_bytes(bytes)
 
     def protocol_error(self, exception):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZeYCGAAAtpfgAAUUWf//3ID
AAC////wUAWYvAAAa0AAASomQmmmI2SPU0aaAAAANDDQ0AAAGgAAAABKJkUMpm1NIeoMNTINBtT1
DJoww0NAAABoAAAAAKlEBNNAEMhomQymCnhGk8Sqa5u0KD5Mq/hCwXpngEYFEpFI2LiZldER7CQx
jOh3jUCSS4fKHmdgoKKX7kN7kgUzjwCYwpvoPrdZSQjTAI4z/LoEmIEcI7F7mJi9QVj8pBU+PAmO
V1qPWUlBMJKVSpkheyZVLXDpG7RBBBhblshopKf/eE6nCnE0qubgfkxDCdjcmxzceJ/i4nc41fvp
nNCHNNc4mrl823fhWtbBeTUpRvb54ptVRPa6S+Wq2l5aOb1WOyi1SQsqJoxlVhcs/x7bnU+TXGTX
WLDXrDNjTSVnSi5ivRqdC7BYv330fZeUs2lJXRvpXY87JsbNrgobEdNamzWUYPCXv0m1Gj1rhM0S
pmm5FqLsTtRuwOB6MEvsGnYpGC4tUXQ3sGKr2IwLJMFEvcaHFgr1NjBwKdf+r4ya681hjkqWqtcr
p3NRoUYL38lsx5V7TJgZYs33uaWxk4I0sdraxbX7nw7cqbcHFZRZlaskLTWvtd036i9vczBWN7e5
tzYsXxQuc6I0NmLibWSdqM07mhcppyz60zNKtSKL1ahetbTdgxVo0rJhc1ODYyZMK4MqtbOYqKNb
cxmhkuRcmTA0L4pLksmBjJb6xj8z3KE+ihY7VFx5NViko4TropSOj8HozWL1S9RVYr/U5Id+uXpS
lH58FbWK5oTYrJVl7s7lKOpYPBgnadG93vd1PqcnsaLWyRzkox/reblzj79+HFMpu1k/Pc+iH+t1
kdye/S9z3NKdrBD997w4euxLGt85yQ9vmPk1jFZp4+JWUWkfS3rKnKwdCQOi2k5m0HQYRWKNT4NL
opweTQ8j1y1ofX0+259FKKPGxLFbXVV8hS+CXDCgnIoqxoiWcYaAUDZkZhLBaESD5nnxv7Fc3l4I
e7sfF+lHJ1cLH8SiOlWrr62NzzoKut5GjKSW7lkGKWut883Nvb1jmq+BRevLmo/Dc96j021j4p0W
f04IV8yP08Z4vZOwrzFO92xnZ6S170b0v166UfxFh1nRyFh1f3Jo1Wv5zWr25coHmHAyscdW5PgW
t+s9u+Tsdxk6O7RE6lHxpaNHjL+Twe9PFpZH5TS3R0QyOz4Pyo76vB9HA0mTFnMntPsxxuTgo0EU
JmYryl8lLWuXWrbbn6a2wpnKKylzT6MfyWzJdClEdcqmxPLB7aTapwu8ZMJvUknowtX2qIxkw0R3
2Jq7852OeucHN1pcWzEX9enh+JZiyZFH1TvTFOJ1o7kcs9e6xKyeDzclxOGx6qtqiWPTShp0aUq5
ZW7RngvuIoUYVTvKp9kdqyUi0yKKOcTC2XOzYwqajoGKr8PRGlO5o+mUTQoyGqu59ne2XFHwNq9C
rUzMGqpwvKlHRXGTRIxuqmtqrPJK2nJC+dHjLPBgpMtVUP7ebNNLODzQ4p8WxNFPu3fI+uRknSVY
PNKqqNSd07pytRhNm7VPN6tT7o/4XckU4UJCXmAhgA==