On Wed, Nov 10, 2010 at 02:43:37PM +0100, Goffart Olivier (Nokia-MS-Qt/Oslo) wrote: > Things to think about: > - What if we are talking in branch instead of patches? > So the tool must have a ways to handle both single patches, or full > branch (where sha-1 cannot be modified) > we define that this cannot happen. everything is cherry-picked into a long-lived branch (which means that a) everyone will have to get used to working with short-lived independent branches and b) that we'll gain more topic branches). which brings us to the next question:
> - how are the merges (eg, 4.7 into master) done? > as usual - except that like every other commit which gets integrated, the merges need to be cherry-picked (otherwise we'd have to suspend the rest of the integration queue or add automatic back-merges). that might turn out to be a challenge, but it shouldn't be fundamentally impossible. _______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
