Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate all modules from v11 to v12 #70

Merged
merged 4 commits into from
Jun 3, 2019
Merged

Conversation

alexis-via
Copy link
Contributor

No description provided.

@alexis-via alexis-via added this to the 12.0 milestone May 28, 2019
@moylop260
Copy link

Could you check the following post, please?
https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-12.0

@rvalyi
Copy link
Member

rvalyi commented May 30, 2019

Hello @moylop260
I was wondering if this was still the preferred way in the OCA (we always did it this way) as recently contributors such as @sebastienbeau and @sbidoul concluded the old branch way was making it easier to merge PRs in either branches when the code doesn't differ too much as it messes less with the history. I didn't follow if something was decided about this in the last meeting or something, all I know is that it's the way @sebastienbeau and @sbidoul started the 12.0 branches of the Shopinvader repos for instance (I'm not questionin the advantages of the reset way that helped clean legacy modules out from the early OCA days). So I'm just asking: are you sure the link you mentionned is still the required way?

@moylop260
Copy link

moylop260 commented May 30, 2019

Hello @rvalyi
Let me ask to OCA members board
@max3903 @pedrobaeza
Are there changes in the way to migrate modules different to https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-12.0?

@rvalyi
Copy link
Member

rvalyi commented May 30, 2019

@moylop260 in doubt: what is the thing that annoys you really here? Is it the way the 12.0 branch was started or is it the per-module PR rule, or both?

@moylop260
Copy link

I saw 68 commits for 11.0 branch:

It PR talk about migrate all modules but it has just 4 commits.
I expected saw >68 commits to migrate to 12.0

Maybe I'm missing something special for this report.

@rvalyi
Copy link
Member

rvalyi commented May 30, 2019

Hello @moylop260
I'm not trying the defend the way the migration is done here, but may be there is a misunderstanding: this is not the usual case were the guy screwed the project history. In fact the project history is already present in the 12.0 branch because the branch was created the old way like

git checkout 11.0
git checkout -b 12.0

then, like during the 6.1->7.0 and 7.0->8.0 migrations the modules were set as 'instalable': False
2efd611

And so these 4 commits here are really just the migration commits, albeit not PR module as expected (yet these are simple changes).

In case one still think this is a problem I can assist to rebuild the 12.0 branch and do the cherry-pick/migration PRs. Let me know.

@pedrobaeza
Copy link
Member

@moylop260 do you have it clear or need extra explanations?

I have to say that I don't like too much to have several modules migrated at the same time in the same PR, but I'm not going to block it as I don't contribute directly to this repo.

@alexis-via alexis-via merged commit 11a5d15 into OCA:12.0 Jun 3, 2019
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.

None yet

5 participants