On May 7, 2014, at 7:42 AM, Itamar Turner-Trauring <[email protected]> wrote:
> A diff between the 14.0.0pre5 branch and trunk suggests merging it into trunk
> would do bad things, so I'm not sure it's releasable as is... This may be
> operator error on my part though.
>
This doesn't look significant.
A squash merge in git gives me these conflicts:
Unmerged paths:
both modified: twisted/internet/_sslverify.py
deleted by them: twisted/topfiles/5190.feature
The conflict in _sslverify.py is trivial, a single hunk that looks like this:
diff --cc twisted/internet/_sslverify.py
index 5fbdc58,0d2e312..0000000
--- a/twisted/internet/_sslverify.py
+++ b/twisted/internet/_sslverify.py
@@@ -1493,15 -1479,6 +1493,18 @@@ class OpenSSLCertificateOptions(object)
return ctx
++<<<<<<< HEAD
+
+OpenSSLCertificateOptions.__getstate__ = deprecated(
+ Version("Twisted", 14, 1, 0),
+ "a real persistence system")(OpenSSLCertificateOptions.__getstate__)
+OpenSSLCertificateOptions.__setstate__ = deprecated(
+ Version("Twisted", 14, 1, 0),
+ "a real persistence system")(OpenSSLCertificateOptions.__setstate__)
+
+
++=======
++>>>>>>> origin/releases/release-14.0.0-7039-3
class _OpenSSLECCurve(FancyEqMixin, object):
"""
so simply deleting the conflict markers ought to merge it satisfactorily. If I
do so and run the tests they pass.
5190.feature can simply be deleted in trunk.
-glyph
_______________________________________________
Twisted-Python mailing list
[email protected]
http://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python
