Em Quinta-feira, 11 de Novembro de 2010, às 10:36:01, Oswald Buddenhagen escreveu: > 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.
Sounds interesting, but I have my doubts this will work. Replaying merges
isn't very easy, as evidenced by the little use that rebase -m has. It also
depends on the merges only happening in one direction and requires that no
conflict resolution happened in those merges.
A merge that was successful at one point can fail when rebased/remerged.
--
Thiago Macieira - thiago.macieira (AT) nokia.com
Senior Product Manager - Nokia, Qt Development Frameworks
Sandakerveien 116, NO-0402 Oslo, Norway
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
