[MERGE] Workaround SSLFile wrong readline prototype and fix bogus tests

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> John Arbash Meinel has voted comment.
> Status is now: Semi-approved
> Comment:
> Didn't this get merged into 1.12 and then merged from there into
> bzr.dev?

No, apparently not.
$ cd bzr/bzr.dev
$ bzr merge ~/Desktop/httplib-broken-readline-3992.patch
 M  NEWS

 M  bzrlib/tests/test_http.py
 M  bzrlib/tests/test_read_bundle.py
Text conflict in NEWS
Text conflict in bzrlib/tests/test_http.py
2 conflicts encountered.

abentley at lumpy:~/bzr/bzr.dev$ bzr status
 M  NEWS
?   NEWS.OTHER
?   NEWS.THIS
 M  bzrlib/tests/test_http.py
?   bzrlib/tests/test_http.py.OTHER
?   bzrlib/tests/test_http.py.THIS
 M  bzrlib/tests/test_read_bundle.py
C   Text conflict in NEWS
C   Text conflict in bzrlib/tests/test_http.py
P   Vincent Ladeuil 2009-02-10 Fixed as per Martin's review.


> Why isn't this considered merged already?

It's not.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmjCgAACgkQ0F+nu1YWqI3cSQCfcJMhBI4uq0TAbhAL6z9b4697
KdMAn33h5g8+nSOmSA6AuTV0OD9o0Poa
=Kcrj
-----END PGP SIGNATURE-----