Rev 2224: Remove unnecessary trivial divergences from bzr.dev. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2224
revision-id: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
parent: andrew.bennetts at canonical.com-20070416055251-imntu6k33rni8h4o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-04-16 16:53:00 +1000
message:
  Remove unnecessary trivial divergences from bzr.dev.
modified:
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/smart/protocol.py'
--- a/bzrlib/smart/protocol.py	2007-04-11 04:26:23 +0000
+++ b/bzrlib/smart/protocol.py	2007-04-16 06:53:00 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2007 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -241,12 +241,6 @@
         return result
 
 
-# XXX: TODO: Create a SmartServerRequestHandler which will take the responsibility
-# for delivering the data for a request. This could be done with as the
-# StreamServer, though that would create conflation between request and response
-# which may be undesirable.
-
-
 class SmartClientRequestProtocolOne(SmartProtocolBase):
     """The client-side protocol for smart version 1."""
 

=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py	2007-04-11 04:26:23 +0000
+++ b/bzrlib/smart/request.py	2007-04-16 06:53:00 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2007 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-04-13 05:48:30 +0000
+++ b/bzrlib/tests/__init__.py	2007-04-16 06:53:00 +0000
@@ -2214,6 +2214,7 @@
                    'bzrlib.tests.test_ssh_transport',
                    'bzrlib.tests.test_status',
                    'bzrlib.tests.test_store',
+                   'bzrlib.tests.test_strace',
                    'bzrlib.tests.test_subsume',
                    'bzrlib.tests.test_symbol_versioning',
                    'bzrlib.tests.test_tag',