Openbravo ERP r2.50 provisional branch
August 5, 2008
In this post I will introduce some guidelines and recommendations on how to manage the source code branches for Openbravo R2.40 and R.250.
Currently trunk is used for bug fixing for r2.40 until r2.40 stable version is released.
A branch for r2.50 developments was created from trunk and will be merged back to trunk once r2.40 stable is released. Periodically r2.50 branch will be updated with trunk to take there the bug fixed in trunk.
Taking all this into account the way of working should be:
- Bug fixing: Only commit to trunk, it is not necessary to do it to r2.50 because these commits will be merged periodically, in case you want to commit the fix also to r2.50 do it via merge: do not make different commits in both sides (which could cause conflicts).
- New r2.50 developments: Create a branch for the project from r2.50 branch. Once the project is finished merge it back (reintegrate) to r2.50 branch, in case when the project is finish r2.40 stable is released the merge back will go to trunk.
3 Comments Add your own
Leave a Comment
Some HTML allowed:
<a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <pre> <del datetime=""> <em> <i> <q cite=""> <strike> <strong>
Trackback this post | Subscribe to the comments via RSS Feed
1. OBTrainings » Blog Archive » Se cierra la lista de anuncios para el desarrollo | August 6, 2008 at 10:50
[...] principal de comunicación. Por poner un ejemplo hoy mismo en el planet Asier Lostalé ha puesto un anuncio contando cómo van a gestionar las ramas de subversion para la versión [...]
2. AlexM | August 12, 2008 at 14:27
I found your site on technorati and read a few of your other posts. Keep up the good work. I just added your RSS feed to my Google News Reader. Looking forward to reading more from you down the road!
3. UUIDs in Openbravo ERP r2.50 « a lost tale @ Openbravo | August 14, 2008 at 16:56
[...] August 14, 2008 UUID project branch has been merged with r2.50 branch. [...]