OCA / odoo-module-migrator

Python library to migrate odoo base code from a version to another
GNU Affero General Public License v3.0
130 stars 119 forks source link

Update regexp to detect <tree> tag with color attribute #44

Closed JonathanStein closed 2 years ago

JonathanStein commented 3 years ago

Migrations of some XML-files took minutes, and some seemed to get totally stuck with the old regexp. I think this one should work for most cases, and all files were processed in less than a second.

OCA-git-bot commented 3 years ago

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). 🤖

legalsylvain commented 3 years ago

Hi @JonathanStein. could you rebase to solve the conflict ?

also adding a test as @Yajo suggested should be great.

kind regards.

legalsylvain commented 2 years ago

/ocabot rebase

OCA-git-bot commented 2 years ago

@legalsylvain The rebase process failed, because command git rebase origin/master failed with output:

First, rewinding head to replay your work on top of it...
Applying: Update regexp to detect <tree> tag with color attribute
Using index info to reconstruct a base tree...
M   odoo_module_migrate/migration_scripts/migrate_100_110.py
Falling back to patching base and 3-way merge...
Auto-merging odoo_module_migrate/migration_scripts/migrate_100_110.py
CONFLICT (content): Merge conflict in odoo_module_migrate/migration_scripts/migrate_100_110.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update regexp to detect <tree> tag with color attribute
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
legalsylvain commented 2 years ago

hi. happy new years ! could you fix conflict ? thanks !

JonathanStein commented 2 years ago

I choose the fastest approach and retried with a new PR #62...