On Monday 30 March 2015 15:31:06 Lankswert, Patrick wrote: > As one of three maintainers, I cannot dictate the branching policy. Please > review the branching policy provide by June and provide feedback. I would > love to have agreement from the major contributors for execution > immediately after the next release in April.
The plan looks sane. It's almost exactly the branching plan we used to use for Qt between versions 5.0 and 5.3. Since that version, we no longer have a long-term branch that matches the stable release (we called it "stable", in June's diagram that's "master"). Instead, we simply have a numbered release branch. There, the current official branches are: $ git ls-remote origin refs/heads/* 73a1e8c60d894701f34806cc4b847aa2814bf389 refs/heads/5.3 b1d99dad098320777a4391052eac531c834748fa refs/heads/5.3.1 209a75f2d071e0977b6c0a8a2ce5d6eb0ff95b8c refs/heads/5.3.2 7baaec17edb06634f1d6235a55c7adbd112cba3e refs/heads/5.4 5367fa356233da4c0f28172a8f817791525f5457 refs/heads/5.4.0 69196b38c481610ef30bfe8ce8e7ba6826729ab8 refs/heads/5.4.1 dce3561aa9b5e3a88149e7ce2a44674002d4aac8 refs/heads/5.5 046f3254838715079b853ab4e15eed4ef464fb30 refs/heads/dev c51d26b6ec7869641441d01597c3e7acc643f93f refs/heads/old/5.0 779fa9c590a1bf399b34fbf293d8399e61a1e15c refs/heads/old/5.1 f15d9e6ccd006a2b47b50ae755fbe9534748a2eb refs/heads/old/5.2 Note to self: ask admins to delete the 5.3.1, 5.4.0, 5.4.1 branches. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center
