<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On May 7, 2014, at 7:42 AM, Itamar Turner-Trauring <<a href="mailto:itamar@itamarst.org">itamar@itamarst.org</a>> wrote:</div><blockquote type="cite"><div style="font-family: Verdana,Geneva,sans-serif"><p>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.</p></div></blockquote>This doesn't look significant.</div><div><br></div><div>A squash merge in git gives me these conflicts:</div><div><br></div><div>Unmerged paths:</div><div><br><span class="Apple-tab-span" style="white-space: pre;"> </span>both modified: twisted/internet/_sslverify.py<br><span class="Apple-tab-span" style="white-space:pre"> </span>deleted by them: twisted/topfiles/5190.feature<br><br></div><div>The conflict in _sslverify.py is trivial, a single hunk that looks like this:</div><div><br></div><div><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><div>diff --cc twisted/internet/_sslverify.py</div><div>index 5fbdc58,0d2e312..0000000</div><div>--- a/twisted/internet/_sslverify.py</div><div>+++ b/twisted/internet/_sslverify.py</div><div>@@@ -1493,15 -1479,6 +1493,18 @@@ class OpenSSLCertificateOptions(object)</div><div> return ctx</div><div> </div><div> </div><div>++<<<<<<< HEAD</div><div> +</div><div> +OpenSSLCertificateOptions.__getstate__ = deprecated(</div><div> + Version("Twisted", 14, 1, 0),</div><div> + "a real persistence system")(OpenSSLCertificateOptions.__getstate__)</div><div> +OpenSSLCertificateOptions.__setstate__ = deprecated(</div><div> + Version("Twisted", 14, 1, 0),</div><div> + "a real persistence system")(OpenSSLCertificateOptions.__setstate__)</div><div> +</div><div> +</div><div>++=======</div><div>++>>>>>>> origin/releases/release-14.0.0-7039-3</div><div> </div><div> class _OpenSSLECCurve(FancyEqMixin, object):</div><div> """</div></div></blockquote><br></div><div>so simply deleting the conflict markers ought to merge it satisfactorily. If I do so and run the tests they pass.</div><div><br></div><div>5190.feature can simply be deleted in trunk.</div><div><br></div><div>-glyph</div><div><br></div></body></html>