On Tue, Dec 18, 2012 at 07:54:37PM +0100, Peter Hartmann wrote: > You are completely right about rebasing - that is exactly what we do > currently: We rebase our internal branch on top of the upstream 4.8 > branch regularly (at least once a week). Where I don't follow you is why > we would need several branches, each one based on a patch release, for > that; IMO we just need one branch (4.8-blackberry10) that we can rebase > periodically on top of the upstream 4.8 branch. > oh. eh. this is somewhat more extreme than expected. in fact, your branch is everything *but* a long-living branch - it's basically a scratch branch which is recreated every few days. the problem with rebasing is that you "detach" the actual history, so your tags are floating in limbo (provided you make tags at all). that's why i suggested a branch per upstream release. but if you rebase that often, this becomes pointless of course (you'd need a separate branch per rebase).
there you have your 4.8-bb10 branch where *only* direct pushing (incl. forced pushes) is enabled. i'll leave it at noting that this is somewhat weird, and that "the project" may still decide that this doesn't belong into the upstream repo. _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development