[Twisted-Python] Re: [Twisted-commits] r20027 - Merge forward so that we can run trial.

[Jonathan Lange]

On 4/20/07, David Reid <dreid at wolfwood.twistedmatrix.com> wrote:
> Author: dreid
> Date: Thu Apr 19 22:25:02 2007
> New Revision: 20027
>
> Added:
>    branches/endpoints-1442-2/twisted/internet/endpoints.py
>       - copied unchanged from r20025, /branches/endpoints-1442/twisted/internet/endpoints.py
>    branches/endpoints-1442-2/twisted/test/test_address.py
>       - copied unchanged from r20025, /branches/endpoints-1442/twisted/test/test_address.py
>    branches/endpoints-1442-2/twisted/test/test_endpoints.py
>       - copied unchanged from r20025, /branches/endpoints-1442/twisted/test/test_endpoints.py
> Modified:
>    branches/endpoints-1442-2/twisted/internet/address.py
>    branches/endpoints-1442-2/twisted/internet/interfaces.py
>
> Log:
> Merge forward so that we can run trial.

What was going on to cause this?

(I guess that one of the disadvantages of merging forward is that you
see the wrong set of changes in the commit email.)

cheers,
jml