[Development] requesting an own 4.8-blackberry10 branch on gitorious

[Oswald Buddenhagen]

On Tue, Dec 18, 2012 at 03:54:20PM +0100, Peter Hartmann wrote:
> Thanks for setting up the branch; however, would it be possible to get a 
> 4.8-blackberry10 branch (without reference to the patch release number)? 

> We are not really releasing our own versions of 4.8.4, 4.8.5 etc., but 
> have our own release cycle for NDK and device images, which is not 
> related to the Qt 4 release cycle in any way.
> 
this is immaterial. you are at some point merging from upstream, which is
also when you should "rebase" your version number. this thinking is also
reflected in vladimir's questions about the versioning.
also, consider that users want to think in terms of "upstream release +
minimal delta", not "rolling release based on older upstream". this is
predestined for a rebase workflow. also, for actually upstreaming your
patches, you need to rebase them anyway. latest when you have conflicts,
you'll really "enjoy" using a non-rebased branch (because you can
resolve twice or thrice - once to merge upstream, once to submit
upstream, and in the worst case once more to merge back the upstreamed
version) - and after some time you'll have a history with conflicted
merges and duplicated commits all over the place, where it's really hard
to find out where something comes from and what was already upstreamed.
given the low number of unmergable vendor patches you are aiming at,
you'd really do yourself and everyone else a favor by rebasing.

but if you are the s/m type, you can have your long-living vendor
branch. ;)

> Also (nitpicking), maybe the suffix should be "-blackberry10" instead of 
> "-bb10", because I guess not everybody knows what "bb10" stands for.
> 
somebody who doesn't know it wouldn't care about that branch to start
with - and most our branch names are not exactly self-explanatory to the
uninitiated.