[Openerp-community] Work in progress: OCB 7.0 on github

classic Classic list List threaded Threaded
14 messages Options
Reply | Threaded
Open this post in threaded view
|

[Openerp-community] Work in progress: OCB 7.0 on github

Stefan Rijnhart (Therp)
Hi,

here is a status update on the migration of OCB 7.0 to github, as
discussed in an informal meeting of several OCB contributors on the
OpenDays 2014.

I've adapted our replay script[1] to port OCB-specific revisions to
Github Odoo/7.0. See [2] for the results of this script applied to
addons and web. It does not work well for the server project, because of
that one unfortunate push of rs-ocb to the OCB server project, but I
think the server changes might just as well be sorted out manually and
submitted in one big pull request. I already tried that out and it is
not that much work.

BTW. Alexandre Fayolle suggested the option of pushing *all* changes
into separate branches, and then process the pull requests manually but
that seems more work in the script as well as in the manual processing
afterwards so I decided to try the incremental replay first.

Attached you find the output of the script. It will tell you that of the
146 changes, there are 49 that give conflicts and should be processed in
some other way. I'm thinking that maybe we can proceed with this unified
branch and process the conflicting revisions in some other way. A large
part of the conflicts should be caused by an existing fix in Odoo, I'm
guessing.

It would be great if someone could do some rough validation to see if
the process seems sound. If that has been verified, we could tag all the
conflicting revisions and see if it is worthwhile just to pick up the
remaining ones manually, after weeding out the duplicate fixes.

In case someone wants to reproduce the results, it is a matter of running

   ocb2git.py ocb-addons openobject-addons odoo
   ocb2git.py ocb-web openerp-web odoo

All the arguments are local bzr and git branches.

Cheers,
Stefan

[1]
http://bazaar.launchpad.net/~therp-nl/lp-community-utils/replay_ocb2git/view/head:/ocb2git.py
[2] https://github.com/StefanRijnhart/odoo/tree/test-replay

--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: [hidden email]
tel: +31 (0) 614478606
web: http://therp.nl


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

ocb2git.out (17K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

Raphael Valyi
Hello Stefan,

From a quick look, the resulting branch looks rather correct. Specially it's cool to see that all replays happen at the HEAD of the branch and that all previous revisions have exactly the same sha1 than the original 7.0 odoo branch.

I agree that the 49 other merges ca be replayed manually then.

I was also in favor of creating 146 branches from the 146 changes because I didn't expect you would make the script do what you did. But I would say given you managed, it looks go to me.


Now I have a question,

during the informal Opendays meeting, we were also suggesting that after each update from upstream odoo branch, OCB patches would be rebased on OCB head. That is the shape of your current branch is very much in line with that.
But do you still believe the best will be to rebase OCB after all subsequent updates instead of doing merges like you would do with BZR for instance?

I have no doubt that it's better to manage the final patches of a branch with Github rebase interactive. Now I'm not 100% convinced yet it's the best for OCB given OCB may still receive additional local patches for production (were no agreement exists yet or because it's a qucik and dirty production hotfix without hope to merge it upstream).
Because one should remember that derivating from a branch that is rebased constantly is possible but not easy.

I was thinking about that when I see that attempt to support vcs-merge for git on the Anybox Recipe: 
This kind of decision (systematic rebase or not) is going to have a lot of impact on these things I believe.


So again, do you still believe the best will be to rebase OCB after all subsequent updates instead of doing merges like you would do with BZR for instance?


Regards and thanks for the hard work.


On Wed, Jun 11, 2014 at 8:02 PM, Stefan <[hidden email]> wrote:
Hi,

here is a status update on the migration of OCB 7.0 to github, as discussed in an informal meeting of several OCB contributors on the OpenDays 2014.

I've adapted our replay script[1] to port OCB-specific revisions to Github Odoo/7.0. See [2] for the results of this script applied to addons and web. It does not work well for the server project, because of that one unfortunate push of rs-ocb to the OCB server project, but I think the server changes might just as well be sorted out manually and submitted in one big pull request. I already tried that out and it is not that much work.

BTW. Alexandre Fayolle suggested the option of pushing *all* changes into separate branches, and then process the pull requests manually but that seems more work in the script as well as in the manual processing afterwards so I decided to try the incremental replay first.

Attached you find the output of the script. It will tell you that of the 146 changes, there are 49 that give conflicts and should be processed in some other way. I'm thinking that maybe we can proceed with this unified branch and process the conflicting revisions in some other way. A large part of the conflicts should be caused by an existing fix in Odoo, I'm guessing.

It would be great if someone could do some rough validation to see if the process seems sound. If that has been verified, we could tag all the conflicting revisions and see if it is worthwhile just to pick up the remaining ones manually, after weeding out the duplicate fixes.

In case someone wants to reproduce the results, it is a matter of running

  ocb2git.py ocb-addons openobject-addons odoo
  ocb2git.py ocb-web openerp-web odoo

All the arguments are local bzr and git branches.

Cheers,
Stefan

[1] http://bazaar.launchpad.net/~therp-nl/lp-community-utils/replay_ocb2git/view/head:/ocb2git.py
[2] https://github.com/StefanRijnhart/odoo/tree/test-replay

--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: [hidden email]
tel: <a href="tel:%2B31%20%280%29%20614478606" value="+31614478606" target="_blank">+31 (0) 614478606
web: http://therp.nl


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp



_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

Stefan Rijnhart (Therp)
Hi Raphael,

thanks for taking a look!

On 12-06-14 15:02, Raphael Valyi wrote:

>
>
> I have no doubt that it's better to manage the final patches of a
> branch with Github rebase interactive. Now I'm not 100% convinced yet
> it's the best for OCB given OCB may still receive additional local
> patches for production (were no agreement exists yet or because it's a
> qucik and dirty production hotfix without hope to merge it upstream).
> Because one should remember that derivating from a branch that is
> rebased constantly is possible but not easy.
>

You could be right about that. I'll do some tests myself, and maybe some
of the other more git-knowledgeable people can chip in.

Cheers,
Stefan.

--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: [hidden email]
tel: +31 (0) 614478606
web: http://therp.nl


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

David Arnold - El Alemán
I cannot make a complete 1:1 match on the subject, as I don't understand it enterely. But here's what the doc says: http://git-scm.com/book/en/Git-Branching-Rebasing#The-Perils-of-Rebasing


----------------------
David Arnold B.A. HSG
Gerente

+57 315 304 1368

​El Alemán S.A.S, Carrera 13 # 93 - 40 P4, Bogotá D.C, Colombia


2014-06-12 8:38 GMT-05:00 Stefan <[hidden email]>:
Hi Raphael,

thanks for taking a look!


On 12-06-14 15:02, Raphael Valyi wrote:


I have no doubt that it's better to manage the final patches of a branch with Github rebase interactive. Now I'm not 100% convinced yet it's the best for OCB given OCB may still receive additional local patches for production (were no agreement exists yet or because it's a qucik and dirty production hotfix without hope to merge it upstream).
Because one should remember that derivating from a branch that is rebased constantly is possible but not easy.


You could be right about that. I'll do some tests myself, and maybe some of the other more git-knowledgeable people can chip in.

Cheers,
Stefan.


--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: [hidden email]
tel: <a href="tel:%2B31%20%280%29%20614478606" value="+31614478606" target="_blank">+31 (0) 614478606
web: http://therp.nl


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

Raphael Valyi
In reply to this post by Stefan Rijnhart (Therp)
Stefan,

I know that last Friday the two topics were running in parallel:
1) the replay of OCB
2) and systematic rebase at OCB update
In fact we started investigating more deeply the concrete consequences of a systematic rebase of OCB in French with Alexandre en Sandy.

So in case you missed it, by rebasing OCB systematically at every update from upstream odoo:

pros:
  clean history with explicit patches that can easily be shared between OCB 7.0, 8.0 or official branches. That's kind of giving a chance for OCB not being a fork ;-p


cons:

despite OCB will be the final branch for may be 80% of the use case, in may be 20% of the use case, people will still need to add extra patches on it, mostly if a patch has not been accepted in upstream OCB or if it's an assumed quick and dirty patch with no universality pretension as it does happen sometimes.

In that case, when updating from upstream OCB, people might get a "detached branch" with their old sha1 that they had deployed previously. Then they may need to tag that sha1 to avoid it to be garbage collected automatically... In the case they want to replicate an install with the former sha1 they used in production (say for hunting a regression), then they may need to push that detached sha1 somewhere because it would have no meaning on a fresh checkout of OCB...
I mean that's really a lot of plumbing to assume...

I will gladly listen to git experts, but my preference today is to go merge instead of rebase, despite the mess. If we go for rebase, well then that plumping should be assumed, specially in tools like Anybox recipe against many of us are now converging.


Regards.

-- 
Raphaël Valyi
Founder and consultant
+55 21 3942-2434




On Thu, Jun 12, 2014 at 10:38 AM, Stefan <[hidden email]> wrote:
Hi Raphael,

thanks for taking a look!


On 12-06-14 15:02, Raphael Valyi wrote:


I have no doubt that it's better to manage the final patches of a branch with Github rebase interactive. Now I'm not 100% convinced yet it's the best for OCB given OCB may still receive additional local patches for production (were no agreement exists yet or because it's a qucik and dirty production hotfix without hope to merge it upstream).
Because one should remember that derivating from a branch that is rebased constantly is possible but not easy.


You could be right about that. I'll do some tests myself, and maybe some of the other more git-knowledgeable people can chip in.

Cheers,
Stefan.


--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: [hidden email]
tel: <a href="tel:%2B31%20%280%29%20614478606" value="+31614478606" target="_blank">+31 (0) 614478606
web: http://therp.nl



_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

Lionel Sausin
If OCB is not supposed to be a fork, then act like you are not the "upstream", just a branch like the others.
Make sure it merges cleanly into official, and make the history clean you can. If rebase does that then I'd say go ahead.

From my point of view it's OK and cleaner to rebase OCB, because I for one won't mirror OCB on the production server.
I'll simply fork the official branches and then merge OCB just like my other feature/bugfix branches, and re-merge from time to time.
The big bonus of this approach is that you get a very clear upgrade log of the production server which is always handy to track regressions.

Lionel Sausin.

Le 12/06/2014 16:26, Raphael Valyi a écrit :
Stefan,

I know that last Friday the two topics were running in parallel:
1) the replay of OCB
2) and systematic rebase at OCB update
In fact we started investigating more deeply the concrete consequences of a systematic rebase of OCB in French with Alexandre en Sandy.

So in case you missed it, by rebasing OCB systematically at every update from upstream odoo:

pros:
  clean history with explicit patches that can easily be shared between OCB 7.0, 8.0 or official branches. That's kind of giving a chance for OCB not being a fork ;-p


cons:

despite OCB will be the final branch for may be 80% of the use case, in may be 20% of the use case, people will still need to add extra patches on it, mostly if a patch has not been accepted in upstream OCB or if it's an assumed quick and dirty patch with no universality pretension as it does happen sometimes.

In that case, when updating from upstream OCB, people might get a "detached branch" with their old sha1 that they had deployed previously. Then they may need to tag that sha1 to avoid it to be garbage collected automatically... In the case they want to replicate an install with the former sha1 they used in production (say for hunting a regression), then they may need to push that detached sha1 somewhere because it would have no meaning on a fresh checkout of OCB...
I mean that's really a lot of plumbing to assume...

I will gladly listen to git experts, but my preference today is to go merge instead of rebase, despite the mess. If we go for rebase, well then that plumping should be assumed, specially in tools like Anybox recipe against many of us are now converging.


Regards.

-- 
Raphaël Valyi
Founder and consultant
+55 21 3942-2434




On Thu, Jun 12, 2014 at 10:38 AM, Stefan <[hidden email]> wrote:
Hi Raphael,

thanks for taking a look!


On 12-06-14 15:02, Raphael Valyi wrote:


I have no doubt that it's better to manage the final patches of a branch with Github rebase interactive. Now I'm not 100% convinced yet it's the best for OCB given OCB may still receive additional local patches for production (were no agreement exists yet or because it's a qucik and dirty production hotfix without hope to merge it upstream).
Because one should remember that derivating from a branch that is rebased constantly is possible but not easy.


You could be right about that. I'll do some tests myself, and maybe some of the other more git-knowledgeable people can chip in.

Cheers,
Stefan.


--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: [hidden email]
tel: <a moz-do-not-send="true" href="tel:%2B31%20%280%29%20614478606" value="+31614478606" target="_blank">+31 (0) 614478606
web: http://therp.nl




_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

Georges Racinet
In reply to this post by Raphael Valyi
On 06/12/2014 04:26 PM, Raphael Valyi wrote:
>
> I will gladly listen to git experts, but my preference today is to go
> merge instead of rebase, despite the mess. If we go for rebase, well
> then that plumping should be assumed, specially in tools like Anybox
> recipe against many of us are now converging.
My gut feeling goes for the simple merge, but I'd need to think a bit
more about it*
 
Even though that would make the history probably harder to follow, it
does not require everybody to be a git expert. Yes, plumbing could
alleviate some of the git-fu, but at the cost of obscurity.

* I'd like to take a look at how the major supported forks of the Linux
kernel (-rt for instance) proceed

--
Georges Racinet
Anybox SAS, http://anybox.fr
Bureau: 09 72 39 50 97 / 09 72 39 13 06
Portable: 06 51 32 07 27
GPG: 0x33AB0A35, sur serveurs publics


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Work in progress: OCB 7.0 on github

Pedro Manuel Baeza Romero
Hi, Stefan,

Is there already something decided about the method to follow? I'm starting to practise with git, and I think we can handle migration with the approach you suggest (ocb-replay script and manually processing the 49 conflicts). I can help in this process, but we should make the switch as soon as possible to avoid this uncomfortable middle situation.

Let me know when you need my help.

Regards.


2014-06-16 12:18 GMT+02:00 Georges Racinet <[hidden email]>:
On 06/12/2014 04:26 PM, Raphael Valyi wrote:
>
> I will gladly listen to git experts, but my preference today is to go
> merge instead of rebase, despite the mess. If we go for rebase, well
> then that plumping should be assumed, specially in tools like Anybox
> recipe against many of us are now converging.
My gut feeling goes for the simple merge, but I'd need to think a bit
more about it*

Even though that would make the history probably harder to follow, it
does not require everybody to be a git expert. Yes, plumbing could
alleviate some of the git-fu, but at the cost of obscurity.

* I'd like to take a look at how the major supported forks of the Linux
kernel (-rt for instance) proceed

--
Georges Racinet
Anybox SAS, http://anybox.fr
Bureau: 09 72 39 50 97 / 09 72 39 13 06
Portable: 06 51 32 07 27
GPG: 0x33AB0A35, sur serveurs publics


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

[Openerp-community] Announcement: OCB 7.0 on github

Stefan Rijnhart (Therp)
On 02-07-14 20:30, Pedro Manuel Baeza Romero wrote:
> Hi, Stefan,
>
> Is there already something decided about the method to follow? I'm
> starting to practise with git, and I think we can handle migration
> with the approach you suggest (ocb-replay script and manually
> processing the 49 conflicts). I can help in this process, but we
> should make the switch as soon as possible to avoid this uncomfortable
> middle situation.
>

Great timing Pedro ;-)

I just pushed https://github.com/OCA/OCB/tree/7.0, which is an
up-to-date version of the replay process as described earlier in this
thread.

We can now all visit https://github.com/OCA/OCB/wiki/lp2git-replay and
annotate all the failed commits: check out if an alternative fix has
been made in Odoo, and if not: propose a new fix on GitHub OCB (and on
Odoo).

I found no great problems applying the diff of the server (which was
done in one big commit because the bzr history got lost at one point).
See here for the details:
https://github.com/OCA/OCB/wiki/lp2git-merge-of-lp:ocb-server-7.0

That means OCB on Launchpad is now deprecated, and we can start applying
fixes on Git on OCB-7.0. We will, however, not get any new commits from
Odoo until we decide on using either the merging or rebasing strategy.
And I will probably refrain from running GitHub OCB-7.0 in production
myself until all failed commits from the replay process have been
clarified, for fear of regressions.

Cheers,
Stefan.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Announcement: OCB 7.0 on github

Pedro Manuel Baeza Romero
Hi, Stefan,

I have changed Wiki to assign me 12 of the 49 conflicts (for now) for resolving manually bit by bit. Do you have any guide you want me to follow? What I have tought is:
  • Inspect the changes of the revision and see if the patch is already inside (because Odoo has made it, but with minor differences).
  • If yes, nothing more to do. Mark as already patched by Odoo.
  • If no, apply changes manually.
  • Commit in local branch with original author.
  • Push directly to GitHub.

Is this procedure OK for you?

Regards.


2014-07-02 21:44 GMT+02:00 Stefan <[hidden email]>:
On 02-07-14 20:30, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,

Is there already something decided about the method to follow? I'm starting to practise with git, and I think we can handle migration with the approach you suggest (ocb-replay script and manually processing the 49 conflicts). I can help in this process, but we should make the switch as soon as possible to avoid this uncomfortable middle situation.


Great timing Pedro ;-)

I just pushed https://github.com/OCA/OCB/tree/7.0, which is an up-to-date version of the replay process as described earlier in this thread.

We can now all visit https://github.com/OCA/OCB/wiki/lp2git-replay and annotate all the failed commits: check out if an alternative fix has been made in Odoo, and if not: propose a new fix on GitHub OCB (and on Odoo).

I found no great problems applying the diff of the server (which was done in one big commit because the bzr history got lost at one point). See here for the details: https://github.com/OCA/OCB/wiki/lp2git-merge-of-lp:ocb-server-7.0

That means OCB on Launchpad is now deprecated, and we can start applying fixes on Git on OCB-7.0. We will, however, not get any new commits from Odoo until we decide on using either the merging or rebasing strategy. And I will probably refrain from running GitHub OCB-7.0 in production myself until all failed commits from the replay process have been clarified, for fear of regressions.

Cheers,
Stefan.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Announcement: OCB 7.0 on github

Stefan Rijnhart (Therp)
On 03-07-14 10:02, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,

I have changed Wiki to assign me 12 of the 49 conflicts (for now) for resolving manually bit by bit. Do you have any guide you want me to follow? What I have tought is:
  • Inspect the changes of the revision and see if the patch is already inside (because Odoo has made it, but with minor differences).
  • If yes, nothing more to do. Mark as already patched by Odoo.
  • If no, apply changes manually.
  • Commit in local branch with original author.
  • Push directly to GitHub.

Hi Pedro,

exactly right. For the sake of clarity: push to your own clone, then create pull request. The proposed changes still need to be inspected as in the regular review process, but I think we can fasttrack these and merge upon the second approval.

Thanks!
Stefan


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Announcement: OCB 7.0 on github

Pedro Manuel Baeza Romero
OK, I'll made then PRs.

Regards.


2014-07-03 10:19 GMT+02:00 Stefan <[hidden email]>:
On 03-07-14 10:02, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,

I have changed Wiki to assign me 12 of the 49 conflicts (for now) for resolving manually bit by bit. Do you have any guide you want me to follow? What I have tought is:
  • Inspect the changes of the revision and see if the patch is already inside (because Odoo has made it, but with minor differences).
  • If yes, nothing more to do. Mark as already patched by Odoo.
  • If no, apply changes manually.
  • Commit in local branch with original author.
  • Push directly to GitHub.

Hi Pedro,

exactly right. For the sake of clarity: push to your own clone, then create pull request. The proposed changes still need to be inspected as in the regular review process, but I think we can fasttrack these and merge upon the second approval.

Thanks!
Stefan



_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Announcement: OCB 7.0 on github

Yannick Vaucher @ Camptocamp
Pedro

Those 2 should be OK and integrated in official, already checked them on first run of replay in February.


http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8696: [FIX]
report_webkit - change description for new webkit lib path parameter
([hidden email])
http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8897: [MRG] Fix
a missing context propagation in product/pricelist.py (closes:
lp:1155624) ([hidden email])


Cheers,
Yannick





On Thu, Jul 3, 2014 at 10:26 AM, Pedro Manuel Baeza Romero <[hidden email]> wrote:
OK, I'll made then PRs.

Regards.


2014-07-03 10:19 GMT+02:00 Stefan <[hidden email]>:

On 03-07-14 10:02, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,

I have changed Wiki to assign me 12 of the 49 conflicts (for now) for resolving manually bit by bit. Do you have any guide you want me to follow? What I have tought is:
  • Inspect the changes of the revision and see if the patch is already inside (because Odoo has made it, but with minor differences).
  • If yes, nothing more to do. Mark as already patched by Odoo.
  • If no, apply changes manually.
  • Commit in local branch with original author.
  • Push directly to GitHub.

Hi Pedro,

exactly right. For the sake of clarity: push to your own clone, then create pull request. The proposed changes still need to be inspected as in the regular review process, but I think we can fasttrack these and merge upon the second approval.

Thanks!
Stefan



_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp




--
Yannick Vaucher
Business Solutions Software Developer

Camptocamp SA
PSE A, CH-1015 Lausanne
Phone: +41 21 619 10 30
Office: +41 21 619 10 10

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] Announcement: OCB 7.0 on github

Pedro Manuel Baeza Romero
Thanks, Yannick, I'll write down this then on the wiki.

Regards.


2014-07-03 10:47 GMT+02:00 Yannick Vaucher <[hidden email]>:
Pedro

Those 2 should be OK and integrated in official, already checked them on first run of replay in February.


http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8696: [FIX]
report_webkit - change description for new webkit lib path parameter
([hidden email])
http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8897: [MRG] Fix
a missing context propagation in product/pricelist.py (closes:
lp:1155624) ([hidden email])


Cheers,
Yannick





On Thu, Jul 3, 2014 at 10:26 AM, Pedro Manuel Baeza Romero <[hidden email]> wrote:
OK, I'll made then PRs.

Regards.


2014-07-03 10:19 GMT+02:00 Stefan <[hidden email]>:

On 03-07-14 10:02, Pedro Manuel Baeza Romero wrote:
Hi, Stefan,

I have changed Wiki to assign me 12 of the 49 conflicts (for now) for resolving manually bit by bit. Do you have any guide you want me to follow? What I have tought is:
  • Inspect the changes of the revision and see if the patch is already inside (because Odoo has made it, but with minor differences).
  • If yes, nothing more to do. Mark as already patched by Odoo.
  • If no, apply changes manually.
  • Commit in local branch with original author.
  • Push directly to GitHub.

Hi Pedro,

exactly right. For the sake of clarity: push to your own clone, then create pull request. The proposed changes still need to be inspected as in the regular review process, but I think we can fasttrack these and merge upon the second approval.

Thanks!
Stefan



_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp




--
Yannick Vaucher
Business Solutions Software Developer

Camptocamp SA
PSE A, CH-1015 Lausanne
Phone: <a href="tel:%2B41%2021%20619%2010%2030" value="+41216191030" target="_blank">+41 21 619 10 30
Office: <a href="tel:%2B41%2021%20619%2010%2010" value="+41216191010" target="_blank">+41 21 619 10 10


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp