Hi Yves; I've looked into the links you've send and start to get it. Though I dislike the graphs that try to explain something which is IMHO pretty clear, *once* one understood it, and less helpful before. (Not your fault!)
Am 31.07.2012 09:36, schrieb Yves Blusseau: > 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). Which is inline with your proposal in the mail that started the thread? > '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) So master is merged (or rebased?) from next while/when a release is prepared? Will anything committed to master at all? And if so, what commits will go into master? The three branches are now already there (though "maint" is currently called 4.3-fixes, which can be fixed at least with 5.0). As long as master is almost compatible with next (e.g. uClibc version is API compatible, etc) I can imagine this approach will work. Can you provide an example, how it looks like, if there are major changes in next, as in the past month, where we maintained the 4.x series in master and developed major changes in next? > Let me know what do you think about this. There is always room for improvements:) kp ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
