Rev 2790: Reduce spurious differences to bzr.dev from merge mishaps. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2790
revision-id: robertc at robertcollins.net-20071004222429-xbnfwymz8ak3u60g
parent: robertc at robertcollins.net-20071004220007-6tb7pyeknkhpnfyq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-10-05 08:24:29 +1000
message:
  Reduce spurious differences to bzr.dev from merge mishaps.
modified:
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
=== modified file 'bzrlib/tests/test_msgeditor.py'
--- a/bzrlib/tests/test_msgeditor.py	2007-10-04 22:00:07 +0000
+++ b/bzrlib/tests/test_msgeditor.py	2007-10-04 22:24:29 +0000
@@ -39,6 +39,7 @@
     )
 from bzrlib.trace import mutter
 
+
 class MsgEditorTest(TestCaseWithTransport):
 
     def make_uncommitted_tree(self):

=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2007-10-04 22:00:07 +0000
+++ b/bzrlib/transport/__init__.py	2007-10-04 22:24:29 +0000
@@ -1772,12 +1772,6 @@
 register_lazy_transport('bzr+https://',
                         'bzrlib.transport.remote',
                         'RemoteHTTPTransport')
-register_transport_proto('bzr+https://',
-#                help="Fast access using the Bazaar smart server over HTTPS."
-             )
-register_lazy_transport('bzr+https://',
-                        'bzrlib.transport.remote',
-                        'RemoteHTTPTransport')
 register_transport_proto('bzr+ssh://',
             help="Fast access using the Bazaar smart server over SSH.",
             default_port=22)