jpabloae.blog

Release Engineering at Openbravo

Archive for March 2009

Merging projects made joyful

One of the biggest complaints from developers during the 2.50 development phase was the amount of time and effort it took to merge a project branch into trunk, or vice versa. I want to show you how much this has been simplified with the switch to Mercurial. In this example we merge erp/devel/pi into erp/devel/main, a total of 220 changesets. The process takes less than 3 minutes, including pushing the result to code.openbravo.com.

PS: Put it in full screen to read the text.

Written by jpabloae

27/03/2009 at 09:42

Posted in openbravo

Tagged with ,

Mercurial ready for Openbravo ERP

Openbravo ERP has moved from Subversion to Mercurial. Trunk and the stable branches have been migrated. Trunk has been renamed to “main”. The new server is located in Europe and its new name is code.openbravo.com. This is the new repository structure:

New repository structure

New repository structure

So for example main is located at: http://code.openbravo.com/erp/devel/main

If you browse to http://code.openbravo.com/erp/devel you’ll get the full list of ERP development repositories.

There is a new repository called pi, which stands for Pre-Integration. Till 2.50 is released we will only accept bugfix pushes to main. All new developments have to pushed to the pi repository. Then those developments will be integrated into main when the proper QA has been done.

So to begin with you should install Mercurial. Then if you haven’t done so it’s recommended to read theĀ  developer guide. Then, you can do a clone of main and play with it following the guide. You can also install and configure the Mercurial Eclipse plugin. Before pushing make sure you have properly configured Mercurial. Your credentials are the same one as with Subversion.

So from now on Subversion is not used for trunk and the stable branches. You should work on the new server and with Mercurial.

Written by jpabloae

02/03/2009 at 13:10

Posted in openbravo

Tagged with ,