Skip to content

Conversation

@augustoPerez
Copy link
Contributor

Added a note explaining that the filestores from the upgraded database and the production database have to be merged for on-premise upgrade, on both the testing and the production phases

@robodoo
Copy link
Collaborator

robodoo commented Sep 4, 2023

@augustoPerez augustoPerez requested a review from a team September 4, 2023 11:29
Copy link
Contributor

@xpl-odoo xpl-odoo left a comment

Choose a reason for hiding this comment

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

Nice job! I corrected some typos/grammar issues :)

A couple of general comments:
Could you re-target the PR to use 14.0 as the base instead? I know version numbers are less relevant for upgrade-related matters, but I assume the content you added doesn't only apply from 16.0 onwards. Don't hesitate to ask if you need guidance or want me to take care of it.

Each line should contain 100 characters max, as per the rst guidelines.

@augustoPerez augustoPerez changed the base branch from 16.0 to 14.0 September 5, 2023 09:32
@augustoPerez augustoPerez changed the base branch from 14.0 to 16.0 September 5, 2023 09:32
@augustoPerez augustoPerez force-pushed the 16.0-upgrade-aup branch 2 times, most recently from 91046a4 to 220ef62 Compare September 5, 2023 09:35
@augustoPerez augustoPerez changed the base branch from 16.0 to 14.0 September 5, 2023 09:35
@augustoPerez
Copy link
Contributor Author

Hi @xpl-odoo
Thanks for the review!!
I applied the changes you suggested, thanks for picking up the typos 👍
I just have one doubt about the whitespaces (replied on your comment)

I also retargeted the PR to 14.0. Not sure why it shows conflicts tho, if only one file is modified.
I reset my branch to 14.0, and cherry-pick my commit. It's all the same as 14.0 except for the commit

@xpl-odoo
Copy link
Contributor

xpl-odoo commented Sep 5, 2023

Hi @xpl-odoo Thanks for the review!! I applied the changes you suggested, thanks for picking up the typos 👍 I just have one doubt about the whitespaces (replied on your comment)

I also retargeted the PR to 14.0. Not sure why it shows conflicts tho, if only one file is modified. I reset my branch to 14.0, and cherry-pick my commit. It's all the same as 14.0 except for the commit

Did you hard rest? git reset --hard 14.0

It should be fixed now in any case ;)

NB: I merged the two consecutive note blocks into a single one.

Added a note explaining that the filestores from the upgraded database
and the production database have to be merged for on-premise upgrade,
on both the testing and the production phases
@augustoPerez
Copy link
Contributor Author

Hi @xpl-odoo
Thanks for the changes!!
PR should be ready to merge now 🙂

@xpl-odoo
Copy link
Contributor

xpl-odoo commented Sep 5, 2023

@robodoo r+

robodoo pushed a commit that referenced this pull request Sep 5, 2023
Added a note explaining that the filestores from the upgraded database
and the production database have to be merged for on-premise upgrade,
on both the testing and the production phases

closes #5715

Signed-off-by: Xavier Platteau (xpl) <[email protected]>
@robodoo robodoo temporarily deployed to merge September 5, 2023 11:54 Inactive
@robodoo robodoo closed this Sep 5, 2023
@augustoPerez augustoPerez deleted the 16.0-upgrade-aup branch January 10, 2024 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants