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. If you have commits from 6 months ago,
rebasing will either conflict or will result in something that may not run. And
there's nothing wrong with this: it did 6 months ago and it was fine then.
> on top of that, in the optimal (hopefully usual) case, the long-lived
> feature development would happen in a CI-controlled branch on the same
> system and thus the merges would be directly permitted. if a "foreign"
> branch gets merged, the system should probably demand confirmation that
> it really should pick only the merge, not rebase the entire branch.
That's what I want.
> on a slightly related topic, i wonder what we will do about secret
> branches (there's no way to exclude that on the nokia side, and 3rd
> parties may want that option as well). they could all live in the same
> system and just have appropriate acls (which would have to be lifted
> before the merge into a less protected branch is allowed). but if we
> continue with the paranoia we have regarding the jiras, we would use
> separate instances of the CI system. from there, we could have a way to
> import entire pre-checked branches including all meta data (merge
> requests incl. reviews, test results, etc.) into the public system, or
> we could merge them as "foreign" branches as outlined above.
There are no secret branches that live in the public infrastructure. I also
don't see the need for secret branches at all.
If I want a secret branch, I can keep it on my machine.
--
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
