Community mailing list archives

community@mail.odoo.com

Re: github practices for PR

by
Akretion, David Béal
- 09/10/2014 08:47:49
Hi Yannick and all,

Good example of that I would like tell.

Ok you confirm it's seems impossible in git.

Thank you


David BEAL - Akretion - Odoo Development / Integration
+33 (0)6 67 22 86 89 - +33 (0)4 82 53 84 60

2014-09-10 14:32 GMT+02:00 Yannick Vaucher <yannick.vaucher@camptocamp.com>:
Here is the conext I can think of:

I have module `my_module_exended` to port which depends on module `my_module`

So I have to fix or port both modules from 7.0 to 8.0.
I create 2 PR.

In launchpad you could stack MP for `my_module_extended` on MP for `my_module`

This doesn't seams to be possible in git.
I would advise to separate completelly both PR and say it is required to merge `my_module` first (anyway tests will fail in this case as dependancy won't exists).
And don't forget to add a little comment saying which one depends on which one.

Another use case would be to create 2 separates fixes that will conflict because they touch same code.
In this case I think you can only create your 2 PRs and see which one is accepted first to rebase the second one.

Cheers,

On Wed, Sep 10, 2014 at 10:44 AM, Lorenzo Battistini <lorenzo.battistini@agilebg.com> wrote:
On 09/10/2014 10:01 AM, David Beal wrote:
> Hi community,
>
> Git is really powerful but simple things are sometimes difficult.
>
> How to do a PR based on other PR to restrict files changed display to 
> only one PR.

I'm not sure to understand the use case, but if you want to improve an 
existing PR, you can fork the feature branch involved in the PR and 
propose the changes there.
See the recent events on
https://github.com/OCA/hr/pull/17
As I wanted to help Sandy with that job, I forked his branch and made 
the first PR at
https://github.com/savoirfairelinux/hr/pull/1

Regards

-- 
Lorenzo Battistini
Tel (CH): +41 91 210 23 40
Tel (IT): +39 011 198 25481
http://www.agilebg.com
https://github.com/eLBati

_______________________________________________
Mailing-List: https://www.odoo.com/groups/community-59
Post to: mailto:community@mail.odoo.com
Unsubscribe: https://www.odoo.com/groups?unsubscribe




--
Yannick Vaucher
Business Solutions Software Developer

Camptocamp SA
PSE A, CH-1015 Lausanne

_______________________________________________
Mailing-List: https://www.odoo.com/groups/community-59
Post to: mailto:community@mail.odoo.com
Unsubscribe: https://www.odoo.com/groups?unsubscribe