[Releasing] [Development] Proposal: removing the release branches after the release

[Sergio Ahumada]

El 27/05/14 20:14, Thiago Macieira escribió:
> Em ter 27 maio 2014, às 01:10:04, Thiago Macieira escreveu:
>> Also, please note that the discussion some months ago ended with both Ossi
>> and  I recommending that the tag be merged back into the branch for the
>> minor series. That is, 5.3.0 gets tagged as v5.3.0 on release and v5.3.0 s
>> merged into 5.3; after that, 5.3.0 is deleted.
>
> Note: this step is still missing for Qt 5.3.0. This command *must* result in
> an empty list:
>
> $ git rev-list origin/stable..v5.3.0
> 4e9853139ca04858f1639e0fba6b8caf57474f29
> 54cc48176086a5f529c679141e9dde7911abda5d
>
> Can someone merge v5.3.0 into stable?
>
> Full listing:
> $ git submodule foreach 'git rev-parse -q --verify v5.3.0 > /dev/null && git
> rev-list origin/stable..v5.3.0; exit 0'
> Entering 'qtbase'
> 4e9853139ca04858f1639e0fba6b8caf57474f29
> 54cc48176086a5f529c679141e9dde7911abda5d

https://codereview.qt-project.org/85819

(even though I got a merge conflict that is not reflected in this commit 
message)

> Entering 'qtserialport'
> 3d19812f745fac35aab02743c576a51dd9b0714f

https://codereview.qt-project.org/85822
https://codereview.qt-project.org/85838

(didn't check them, but probably one can be abandoned)

> Entering 'qttranslations'
> 56c55b5db6905b93145cc7e05d4a87326718851e
> 9c49394bddf6469b708998bc3d89e7f96efc67f9
> 0cf314e6b573f3d10860b6b877de8c7a8fd61057
> d56737b29e256a7960674b70e17bc3054840c8a9
> 45b198992e425cb8f8fc0804e2d7b879a7cd6672
> 54628295aca5f8f5a1c98347584fa4b65228e293

https://codereview.qt-project.org/86327

Cheers,