Migration to version 12.0 about connector-prestashop

[ljimenezsidoo]

@Auneor

Sorry, we stopped doing the migration when we saw the work done by florian.

[florian-dacosta]

Hello @pedrobaeza
I would like to make a PR for the connector in version 12, but I am having problems, I wonder if you could help me.
A want to Make a PR with this branch : https://github.com/florian-dacosta/connector-prestashop/tree/12-mig-connector_prestashop
I thought I used the method proposed in maintainer-tools :

$ git remote update # In case the repo was already cloned before
$ git checkout -b 12.0-mig-<module> origin/12.0
$ git format-patch --keep-subject --stdout origin/12.0..origin/11.0 -- <module path> | git am -3 --keep

But it tells me that the oca:12.0 has noting in common, so I guess I did not at the time...

Anyway, when I try to create a new fresh branch using this method, I have a lot of conflict with git am
I also thought that if my branch comes from the version 10, I could rebase on 12.0 and have a similar result, but I also have conflicts.

I can do a new fresh branch if necessary but I don't succeed into avoiding all conflicts during the process.
Have you an idea why?
Thanks

[ljimenezsidoo]

Hello @florian-dacosta

Im working to migrate the connector_prestashop to version 12, and im having maybe the same issue when try to git format path command.

Im going to create a new branch in the PESOL repo to keep working until fix this error. We can connect to prestashop but we need to keep working on this module. I would like to colaborate with you to go forward fast.

[pedrobaeza]

Hello to both. Good to see interest by your part. The problem is that there's no 11.0 branch, so you should change the command to:

git format-patch --keep-subject --stdout origin/12.0..origin/10.0 -- ...

[florian-dacosta]

@pedrobaeza Yes, that is what I did actually. I just copy paste the documentation on the issue, but I had made the change with branch 10.0 when I tried
git format-patch --keep-subject --stdout origin/12.0..origin/10.0 -- connector_prestashop | git am -3 --keep

@acm1pt-colorado Nice to know you are working on it.
I don't know how advanced you are, the branch I propose should be working fine already.

[florian-dacosta]

@pedrobaeza I tried to do the same but from 10.0 to 11.0 but the problem is the same.
I have started to try to resolve conflict, but there are really a lot of conflicts and I guess I would end making mistakes in the resolution...
I am out of ideas to resolve this.

[pedrobaeza]

That happens when you mangle the commit history doing merges instead of rebases, which you are very given to it in the past (already happens for v10), so please stop doing that since now. I will try to fix it and put a branch with all the commit history for you to start with.

[florian-dacosta]

Ok, thank you @pedrobaeza

[rvalyi]

eventually git filter-branch would do the job? Like https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-8.0#how ?

[pedrobaeza]

You have in https://github.com/Tecnativa/connector-prestashop/tree/12.0-mig-connector_prestashop the base branch with the commit history preserved (the best it can be done), and now you can start out of it to include changes for v12.

[florian-dacosta]

Well, I don't really understand how/why or when the history was all mangled, but thanks a lot for the resolution @pedrobaeza
I made the PR on top of your branch.

[pedrobaeza]

Remembering a bit the history, it happens when @bguillot and you merge your simultaneous work in a branch, doing merges with not consecutive commits, so basically it was:

• Branch A:
  • Commit A1
  • Commit A2
  • Commit A3
• Branch B:
  • Commit B1
  • Commit B2

Merge and resolve conflicts of branch B against branch A, so the "mangled" commit history is:

• Branch B
  • Commit B1
  • Commit B2
  • Merge of branch A with conflict solving
    • Commit A1
    • Commit A2
    • Commit A3

When bringing commit history, what you get (more or less) is:

• Commit A1
• Commit B1
• Commit A2
• Commit A3
• Commit B2

so you can imagine the result...

[florian-dacosta]

Well, these are my first commits to the OCA connecor prestashop!
And Sebastien did not work on it for years (version 7 I guess), so I don't really get it...
But ok thanks for the explanation.

[pedrobaeza]

Sorry, it was his colleague @bguillot who work on v9 migration, not @sebastienbeau

[Auneor]

@acm1pt-colorado how is your migration to 12.0 going? we plan to migrate this module to a newer version, maybe 14.0, but we would like to know if any work has already been done

[github-actions]

There hasn't been any activity on this issue in the past 6 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this issue to never become stale, please ask a PSC member to apply the "no stale" label.