[Twisted-Python] Re: [Twisted-commits] r18506 - Fix SSL check.

[Jean-Paul Calderone]

On Mon, 23 Oct 2006 09:51:25 -0600, Ralph Meijer <ralphm at wolfwood.twistedmatrix.com> wrote:
>Author: ralphm
>Date: Mon Oct 23 09:51:25 2006
>New Revision: 18506
>
>Modified:
>   trunk/twisted/words/protocols/jabber/xmlstream.py
>   trunk/twisted/words/test/test_jabberxmlstream.py
>Log:
>Fix SSL check.
>
>Author: ralphm
>Reviewer: exarkun
>Fixes 2171
>

This changeset contains some changes which were made after the review but
never checked into the development branch.  This makes tracking down the
exact set of changes more challenging, since the branch diff does not end
up representing the actual trunk change.  This makes a difference if, for
example, the change needs to be reverted.  The person doing the revert may
not realize the trunk commit represented additional changes and they could
be lost.

For future branch merges, make sure that the trunk commit includes only the
changes from the branch.

Jean-Paul