Odoo Addons (MOVED TO GITHUB)

Some merge question

Asked by Grzegorz Grzelak (OpenGLOBE.pl)

I am improving l10_chart_pl module. This module will be suitable for extra-5.0 and for extra-trunk series.

So I branched both branches
lp:~grzechu.g/openobject-addons/l10n_chart_pl_new
lp:~grzechu.g/openobject-addons/xtrunk_l10n_chart_pl_new
and fixed l10n_chart_pl module in both of them.

I see that I can merge extra-trunk into extra-trunk main branch (I am a commiter).

But I don't see how can I merge or ask for merging into extra-5.0. Can someone explain?

And additional question:

before I become commiter I added fixed l10n_chart_pl module into
lp:~openerp-community/openobject-addons/trunk-addons-community
and asked for merging into extra-trunk.

How can I remove this module from that branch and remove my merging proposal?

Question information

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

Hello,

Use bzr merge lp:~grzechu.g/openobject-addons/l10n_chart_pl_new command in terminal, by going to destination branch where you will merge the changes.But you need to take care regarding conflicts after merging your branch into main barach.
You can check the following bzr command help link for more detail help:
http://doc.bazaar.canonical.com/bzr-0.10/bzr_man.htm

Hope this will help you.

Thanks.

Revision history for this message
Grzegorz Grzelak (OpenGLOBE.pl) (grzegorz-og.pl) said : 		#2

Thank you, I think I did manage. l10n_chart_pl in both branches got fixed.

Revision history for this message
Grzegorz Grzelak (OpenGLOBE.pl) (grzegorz-og.pl) said : 		#3

Thanks vra (openerp), that solved my question.