OCA-git-bot commented 6 years ago

Todo

https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-12.0

Modules to migrate

[ ] account_cutoff_accrual_base - By @rven - #99
[x] account_cutoff_base - By @jeroen7s - #90
[x] account_cutoff_prepaid - By @jimhoefnagels - #93
[ ] account_invoice_accrual - By @sbejaoui - #113
[x] account_invoice_start_end_dates - By @jeroen7s - #89
[x] account_multicurrency_revaluation - By @hbto - #88

hbto commented 5 years ago

Hello OCA community:

I am beginning the migration of the account_multicurrency_revaluation module I am trying to adhere to migration policies following each step as stated in them in the following branch:

https://github.com/vauxoo-dev/account-closing/tree/12.0-account_multicurrency_revaluation-hbto (branch naming to be fixed)

While doing so I have hit a question:

Keeping history of the module being migrated

I have tried to use the command suggested in the policies git format-patch --keep-subject --stdout origin/12.0..origin/11.0 -- <module path> | git am -3 --keep

but it results in errors during the process which could lead to a daunting task in case of modules with large histories, because of the merge conflicts caused by the git am -3 keep part of the command

account-financial-tools_ _hbto_marvin___workspace_account-financial-tools_ _-bash_ _170x48

I have come to use this another approach:

git clone <git repository A url>
cd <git repository A directory>
git remote rm origin
git filter-branch --subdirectory-filter <directory 1> -- --all
mkdir <directory 1>
# Move your files with `git mv`
git mv (each file / folder) <directory 1> 
git add .
git commit -m 'commit message'

And later applying cherry-pick with the resulting commits on the target branh.

Courtesy of this link

Which is the result that you can see in these branches: https://github.com/vauxoo-dev/account-closing/tree/12.0-account_multicurrency_revaluation-hbto https://github.com/vauxoo-dev/account-financial-tools/tree/12.0-account_reversal-hbto

Will this suffice the policies?

I would to have your thoughts regards.

hbto commented 5 years ago

@pedrobaeza https://github.com/OCA/account-closing/issues/85#issuecomment-441413020 could you check this comment

cc/ @moylop260

Regards

pedrobaeza commented 5 years ago

@hbto the previous method was very similar to what you have put now, and it has several drawbacks as files that are left in incorrect places if I don't remember bad, so @sbidoul came with this new method, which is shorter and work in almost all places. The only problem comes with merge operations when there are conflicts that messes up commit history, so when the commit order is unscrambled, the conflicts arise again. I also remember that with the --subdirectory-filter some of this conflicts also happen.

@sbidoul do you have any comment about this?

sbidoul commented 5 years ago

Sorry I don't remember the details. That method with filter-branch did loose some commits but I don't remember the exact circumstances, so be careful.

hbto commented 5 years ago

@sbidoul & @pedrobaeza

While the history is kept then is ok to use either one or the other way?

Thanks in advance for your comments.

Regards.

pedrobaeza commented 5 years ago

Yes, I think so...

hbto commented 5 years ago

Regarding Translation, during migration .po files are to be erased or are they to be kept alongside .pot file.

Regards.

pedrobaeza commented 5 years ago

They should all be kept.

hbto commented 5 years ago

@pedrobaeza

What is to be done regarding:

It looks like some users haven't signed our Contributor License Agreement, yet. You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla Here is a list of the users:

Stefan Rijnhart stefan@therp.nl (no github login found) Sandy Carter sandy.carter@savoirfairelinux.com (no github login found) @ <@> (no github login found) Launchpad Translations on behalf of account-core-editors (no github login found) Appreciation of efforts, OCA CLAbot

So far we are migrating an old module.

How do we address this kind of issue?

pedrobaeza commented 5 years ago

@hbto answered in the thread. Better to not add noise in this general issue.