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 <ste...@therp.nl>: > 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 : openerp-community@lists.launchpad.net > Unsubscribe : https://launchpad.net/~openerp-community > More help : https://help.launchpad.net/ListHelp >
_______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp