On Thu, Nov 11, 2010 at 12:22:45AM +0100, Macieira Thiago (Nokia-MS-Qt/Oslo) wrote: > You can't cherry-pick a merge. > of course you can. a merge is a commit like every other one, just with multiple parents. if you don't like the term cherry-pick in that context, then call it "replay".
> The point is that some submissions will require a merge of $SUBMISSIOn > instead of a cherry-pick of HEAD..$SUBMISSION. > you can have a submission which contains one regular commit, then a merge and then another regular commit. when you follow only the primary parent of each commit (or maybe all parents that are not in the public system yet, depending on what policy we set for merges of yet unpublished commits), you get exactly the set of commits to "replay". no reason to actually merge anything from outside the CI-tested branches. _______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
