[Twisted-Python] Re: [Twisted-commits] r15052 - Merge forward r14926:15051 -- insomnia

Jean-Paul Calderone exarkun at divmod.com
Mon Nov 7 09:56:26 EST 2005

On Mon, 07 Nov 2005 07:37:30 -0700, Jonathan Lange <jml at wolfwood.twistedmatrix.com> wrote:
>Author: jml
>Date: Mon Nov  7 07:37:28 2005
>New Revision: 15052
> [snip]
>Merge forward r14926:15051 -- insomnia

You should always create a new branch, copied from trunk, to merge forward (<http://divmod.org/trac/wiki/MergedForward>).  Doing it in-place makes it much more difficult to determine which changes are yours and which changes belong to someone else.  It also increases the likelyhood of a conflict when you eventually merge into trunk.

For those who aren't aware of it, the tools referenced on the above page are from Combinator (<http://divmod.org/trac/wiki/DivmodCombinator>).


More information about the Twisted-Python mailing list