what does it mean - "merged trunk with latest stable branch."

Asked by Akshay Jain

On the webpage https://code.launchpad.net/~openerp/openobject-addons/trunk it says that "merged trunk with latest stable branch." Does it mean that the trunk code has been moved to stable code OR in other words that stable code has been updated with latest changes?? If yes then which is the latest stable branch??

Question information

Language:
English Edit question
Status:
Answered
For:
Odoo Addons (MOVED TO GITHUB) Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) said :
#1

Hello Akshay Jain,

Stable branch will only be updated when the next version ready for release.The changes done by other for solving bug then it should be check by our quality team member and then merge the specific solution into stable branch for fixing the bug.
"merged trunk with latest stable branch"=>The changes in trunk are fully matured then and then only it will be merged into stable for next version.
All the latest code will be commited in following links :
https://code.launchpad.net/openobject-addons
https://code.launchpad.net/openobject-server

Hope this will help you.
Thanks.

Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) said :
#2

Hello Akshay,

Trunk is under development for version 5.2 and stable is working for 5.0.X.
Bugfixes are done inside stable one,a nd new developments are done inside trunk.

So, for the trunk branch to have bugfixes + new Dev.s, we adopt the changes of stable into trnk so that trunk is with everything-updated code. This line simply says that the changes done instable are now available in trunk after this commit.

So, Trunk = stable + new developments.

Thanks.

Can you help with this problem?

Provide an answer of your own, or ask Akshay Jain for more information if necessary.

To post a message you must log in.