[18.0][MIG] stock_account_operating_unit

[ManfredNelvin-Dev]

Migration of stock_account_operating_unit from Odoo 15.0 to 18.0.

[AaronHForgeFlow]

can you put the pre-commit changes in a separate commit and then the commit for the migration? thanks.

[AaronHForgeFlow]

Code review LGTM

[BhaveshHeliconia]

Please squash the commits as explained here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

[BhaveshHeliconia]

@ManfredNelvin-Dev the commit history looks incorrect. You squashed commits that should not have been squashed.
You only need to squash bot commits, and commits for the same language and the same author, as explained here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

[ManfredNelvin-Dev]

The commit history has been updated according to the review comments:

• pre-commit fixes kept in a separate commit
• migration changes kept in a separate commit

All checks are passing. Kindly review when convenient.

[BhaveshHeliconia]

@ManfredNelvin-Dev the commit history looks incorrect. You squashed commits that should not have been squashed. You only need to squash bot commits, and commits for the same language and the same author, as explained here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

@ManfredNelvin-Dev still not correct.

[ManfredNelvin-Dev]

Hi @BhaveshHeliconia,

I reviewed the branch history and currently have:

• Added stock_account OU module
• [IMP] pre-commit fixes
• [18.0][MIG] stock_account_operating_unit

Could you please point me to the specific commits that should be preserved and not squashed? I would like to restore the commit history according to the OCA guidelines, but I'm not able to identify which original commits were unintentionally squashed.

Thanks.

[BhaveshHeliconia]

@ManfredNelvin-Dev you need to remove all commits from this branch and then replay the original commit history using:

git format-patch --keep-subject --stdout origin/18.0..origin/17.0 -- $module | git am -3 --keep

After that, cherry-pick your commit from this PR and push the branch again.

[ManfredNelvin-Dev]

Hi @BhaveshHeliconia,

I removed the squashed history and replayed the original stock_account_operating_unit commit history from 15.0 using git format-patch and git am, then reapplied the 18.0 migration changes on top.

The branch has been force-pushed. Could you please review it again when convenient?

Thanks.

[BhaveshHeliconia]

@ManfredNelvin-Dev it's still not correct. In v17 there are 67 commits: https://github.com/OCA/operating-unit/pull/673/commits
In this PR, some of those commits are missing. You only need to preserve the proper commit history. There's no need to squash commits here—just keep the original history intact and add your migration commit on top.

[ManfredNelvin-Dev]

Hi @BhaveshHeliconia,

I think there may be some confusion regarding the reference PR.

The PR you linked (#673) is for stock_operating_unit, which was migrated to 17.0 and preserved a 67-commit history.
However, this PR is for stock_account_operating_unit, and this module was not migrated to 17.0.

I verified the following locally:

git ls-tree -r origin/17.0 --name-only | grep "^stock_account_operating_unit/" returns no results, which indicates that stock_account_operating_unit is not present in the current 17.0 branch.

Based on your earlier feedback, I replayed the complete history available for stock_account_operating_unit from 15.0 using:

git format-patch --keep-subject --stdout origin/18.0..origin/15.0 -- stock_account_operating_unit | git am -3 --keep

and then applied the 18.0 migration changes on top.

If there is another branch or commit history for stock_account_operating_unit that should be preserved instead, could you please point me to it? I'm happy to replay the exact history once I know the expected source.

Thanks.