On Wed, Nov 10, 2010 at 05:01:55PM +0100, Macieira Thiago (Nokia-MS-Qt/Oslo) 
wrote:
> My point is that long-lived branches must bypass the cherry-picking mechanism 
> when merging. Those must be submitted via a side mechanism to what Tor Arne 
> described.
> 
but that's exactly what we don't want, because it would disrupt the
normal operation of the queue and complicate the processes. so instead
we cherry-pick the merges themselves, like every other commit. and that
actually works out of the box. the only special-casing that needs to be
done is that the integration system should not follow secondary parents
when figuring out what to cherry-pick.
_______________________________________________
Opengov mailing list
Opengov@qt-labs.org
http://lists.qt-labs.org/listinfo/opengov

Reply via email to