← Back to team overview

openerp-expert-accounting team mailing list archive

Re: trunk layout

 

Le 05/09/10 11:00, Ferdinand Gassauer a écrit :
@Olivier

I followed your suggestion to put changes into a branch for each module
to keep the number of lines changed low.

Thanks, this is quite an improvement over your previous proposals!
We will try to proceed with the successive reviews of the these branches as we go on reviewing the corresponding Applications for RC1.


Please tell me how I should propose the merger starting with branches

stock, SoPo, account,project,mrp,crm in this sequence

As I mentioned in my direct reply to you, you can explictly set the dependencies between your branches when you submit your merge proposal, in the extra options there is the Prerequisite Branch setting. For example the merge proposal for chrichar-trunk-stock-SoPo can mention that it depends on the prior merge of chrichar-trunk-stock.

There are also a few issues remaining in your branches, probably due to the conflicts resolution. You will find them easily by quickly scanning the diffs of the merge props, any large block of diff, especially python code ones, needs to be checked (for example sale/sale.py in the SoPo branch)


I DO NOT KNOW how to tell OpenERP that it must CONDITINALLY install a module

This is done in the configuration wizard of the module. Have a look at the configuration wizards of the new applications in v6, most will allow you to install additional modules, and you could perfectly well create one that detects the installed modules and select more modules for installation.

HTH,



Follow ups

References