On Thu, Nov 11, 2010 at 05:17:39PM +0100, Macieira Thiago (Nokia-MS-Qt/Oslo) wrote: > Em Quinta-feira, 11 de Novembro de 2010, às 16:38:23, Oswald Buddenhagen > escreveu: > > 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. > you cannot push an untouched merge to the integration branch without flushing the queue (i.e., waiting until the current integration run is done) and blocking further integrations until you are done. that's simply too disruptive for the regular operation of the system.
> All it requires is that people submit their features the same way they > submit to the normal branches. > correct. On Thu, Nov 11, 2010 at 05:21:37PM +0100, Macieira Thiago (Nokia-MS-Qt/Oslo) wrote: > Em Quinta-feira, 11 de Novembro de 2010, às 16:24:03, Oswald Buddenhagen > escreveu: > > > The point is that you can't always rebase. If you want to preserve the > > > commits and they can't be rebased (because they were done 6 months ago > > > and are part of a 500-change feature development), the only way is to > > > merge. > > > > yes. so? you still just replay the merge. the first parent is different > > (because the target branch moved on), while the second parent is the > > same as in the original merge (and all commits in that branch are > > preserved). > > That doesn't work! > > You can't rebase in the first place. [...] > that's why you don't. there is no contradiction to what i wrote. > There are no secret branches that live in the public infrastructure. > well, fair enough. if we are good players we'll publish all infrastructure anyway, so everyone can run his own instance. > I also don't see the need for secret branches at all. > as if something like the s60 port could never happen again. > If I want a secret branch, I can keep it on my machine. > well, yeah. with "my" possibly referring to an entire company. _______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
