[17.0] [MIG] partner_deduplicate_acl

[Deriman-Alonso]

Standart Migration

[carolinafernandez-tecnativa]

Functional review LGTM, Thanks :) Could you please squash administrative commits? Thanks

[carolinafernandez-tecnativa]

Functional review LGTM Thanks, Could you please squash administrative commits? https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

Thanks!

[Deriman-Alonso]

Functional review LGTM Thanks, Could you please squash administrative commits? https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

Thanks!

Sure thing, Im on it! 😀

[Deriman-Alonso]

@carolinafernandez-tecnativa Done! Ty for review.

[carolinafernandez-tecnativa]

@carolinafernandez-tecnativa Done! Ty for review.

Still administrative commits im seeing, please check this https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

You have to squash oca-git commits and others defined on link sent before

[pedrobaeza]

The commit history is definitely wrong, with 486 commits and most of them are not from this module.

[Deriman-Alonso]

Hi @pedrobaeza , I personally do believe so, as when I followed the guide it got all the commits from the branch, might you tell me how to fix it? or is this the normal behaviour? Thanks

[pedrobaeza]

I think the module variable hasn't been correctly set, so no filter was done in the procedure.

[Deriman-Alonso]

So what would be the process to follow in order to fix it?

[pedrobaeza]

The specified in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0, but taking into account if you don't have the standard bash, to adapt it to your CLI shell, or directly write the module name in the commands instead of the variable.

[Deriman-Alonso]

The specified in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0, but taking into account if you don't have the standard bash, to adapt it to your CLI shell, or directly write the module name in the commands instead of the variable.

Taking into account that the commit history was properly until I followed the guide, I dont think it was the variable, but might be a missunderstanding on my part when following the command as for in the guide it says "git rebase -i origin/x, where x is the Odoo version (14.0, 15.0, 16.0,...).", so I replace the "x" with 17.0, should I have used the branch where I was doing the migration instead of the 17.0 base one?

[pedrobaeza]

No, it should be 17.0, but maybe you have an outdated fetch of such branch. Always do first git fetch origin 17.0 (where origin is OCA remote).

[pedrobaeza]

This is the squash to be done:

[Deriman-Alonso]

@pedrobaeza Hi, now it should be good,d can you check it out? Ty

[pedrobaeza]

/ocabot migration partner_deduplicate_acl

[OCA-git-bot]

What a great day to merge this nice PR. Let's do it! Prepared branch 17.0-ocabot-merge-pr-1805-by-pedrobaeza-bump-nobump, awaiting test results.

[OCA-git-bot]

Congratulations, your PR was merged at f3a0d6b2c8642998c18a964f1da9a3a8b1ca9650. Thanks a lot for contributing to OCA. ❤️