Re: [leaf-devel] Managing branches with git

[Yves B. <blu...@us...>]

Le 30/07/2012 19:46, KP Kirchdoerfer a écrit :
> Though a short note about what we have done over the weekend, maybe not
> in the best way.
>
> 4.3 has been tagged and released. A new branch for 4.3-fixes has been
> created. So 4.3 (and 4.x) has put into maintenance mode.
> The next branch has been merged into master, because master now is
> targeting to 5.0. The next branch is now obsolete and if possible could
> be even removed/deleted.
>
> kp
Hi kp and all developpers,
Perhaps it will better to have 4 branches like the git project has: 
'master', 'next', 'pu' (proposed updates) and 'maint' for maintenance 
backports (see Large-Merging Workflows in 
http://git-scm.com/book/ch5-3.html).
So we can merge (rebase) our contributions in 'next' branch (will be the 
developpement branch).
'master' branch only move fast-forward and contain only current latest 
tag version.
'maint' branch is used to add bug fixes, security updates for last 
stable version.

So for example, in our case, we would have:
master (tag: 5.0-beta1)
next (contributions above 5.0-beta1)
maint (tag: 4.3)

Let me know what do you think about this.

Yves