[Qt-creator] Suggestion regarding branches

Orgad Shaneh orgads at gmail.com
Thu Feb 20 07:42:33 CET 2014


I have a suggestion regarding the branching policy.

I'll use master and 3.1 for reference, but it applies to following branches
of course.

When master is branched out, you can allow a transition period (1-2 weeks
sounds reasonable), in which:

   - New changes will be pushed to 3.1.
   - Existing changes that target master, but belong to 3.1 will be
   submitted to master
   - New/existing changes that target next master (3.2) will not be
   submitted until the transition period is over. This is the hard part. You
   can either count on approvers to (remember and) obey to this rule, or allow
   submit (for master) only to release managers.
   - When the transition period if over, master will be merged into 3.1,
   submit for master will be free, and any further changes that belong in 3.1
   will have to be resubmitted for it.

What do you think?

- Orgad
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/qt-creator/attachments/20140220/d4a6be40/attachment.html>

More information about the Qt-creator mailing list