Em Quinta-feira, 11 de Novembro de 2010, às 16:38:23, Oswald Buddenhagen escreveu: > > Really, I think you should not try to preserve a linear history at all > > cost. > > i'm not. i'm trying to preserve linear history inside long-lived > branches. rebasing merge commits doesn't change anything about the > branches themselves, only about their merge points. the whole reason for > the merge replaying feat is making merges not different from any other > submission as far as the CI system goes.
Linear history inside a long-lived branch doesn't involve replaying merges
from upstream branches. The merges from the upstream branch should remain as-
is, they don't have to touched.
All it requires is that people submit their features the same way they submit
to the normal branches. The system with early-warning bots and integration
should apply for them too, even if the code is not supposed to compile.
--
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
