Skip to content

[19.0][MIG] maintenance_equipment_hierarchy - #566

Open
robyf70 wants to merge 9 commits into
OCA:19.0from
robyf70:19.0-mig-maintenance_equipment_hierarchy
Open

robyf70 wants to merge 9 commits into
OCA:19.0from
robyf70:19.0-mig-maintenance_equipment_hierarchy

Conversation

@robyf70

@robyf70 robyf70 commented Jun 18, 2026

Copy link
Copy Markdown

Migrated to v19.0

@OCA-git-bot OCA-git-bot added series:19.0 mod:maintenance_equipment_hierarchy Module maintenance_equipment_hierarchy labels Jun 18, 2026
@robyf70 robyf70 changed the title 19.0 mig maintenance equipment hierarchy [19.0][MIG] maintenance_ equipment hierarchy Jun 18, 2026
@robyf70 robyf70 changed the title [19.0][MIG] maintenance_ equipment hierarchy [19.0][MIG] maintenance_equipment_hierarchy Jun 18, 2026
@robyf70
robyf70 force-pushed the 19.0-mig-maintenance_equipment_hierarchy branch from 5a94f96 to b0d63bf Compare June 18, 2026 12:41

@BhaveshHeliconia BhaveshHeliconia left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code review LGTM!

@BhaveshHeliconia

Copy link
Copy Markdown
Contributor

@robyf70 could you please squash the administrative and bot commits?

@OCA-git-bot

Copy link
Copy Markdown
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@robyf70

robyf70 commented Aug 26, 2026

Copy link
Copy Markdown
Author

@robyf70 could you please squash the administrative and bot commits?

@BhaveshHeliconia Sure, but how I can do that?

@dalonsod

Copy link
Copy Markdown
Contributor

@robyf70
robyf70 force-pushed the 19.0-mig-maintenance_equipment_hierarchy branch from b0d63bf to 128e3f5 Compare August 26, 2026 14:02
@robyf70

robyf70 commented Aug 26, 2026

Copy link
Copy Markdown
Author

@dalonsod

Copy link
Copy Markdown
Contributor

@robyf70 review new commit history, it seems that you've make more squashs than required. The goal is only quash those administrative (bot/weblate) commits that were generated by the same action, usually close together. But if you see at generated history, even some migration commits (like 18.0, 17.0, 15.0, or 14.0) are lost.

@BhaveshHeliconia

Copy link
Copy Markdown
Contributor

@robyf70 I’m suggesting one approach that should help keep the migration history clean. If you have another way to achieve the same result, that’s fine too. Otherwise, you can follow this approach:

Remove the existing commits locally without pushing them, rerun the migration process to generate the proper commit history, and then cherry-pick your migration commit from this PR.

After that, squash the administrative and bot/weblate commits as per the guidance and push again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.