-
-
Notifications
You must be signed in to change notification settings - Fork 246
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
[16.0][l10n_br_base] unf*uck the 16.0 branch #3490
Comments
@renatonlima @marcelsavegnago @antoniospneto eu acabei de dar um force push na nova branch 16.0 16.0-mig-l10n_br_base porque tinha um pequeno problema de pre-commit no arquivo requirements.txt, eu apenas tive que acertar as external_dependencies no commit "git cherry-pick 2a09208 # [MIG][l10n_br_base] bump module version 15.0.1.0.0" Com isso ao rodar os testes eu peguei um novo warning que provavelmente vem da presencia agora do PR de refator do CNPJ/vat #2718 do @marcelsavegnago que agora ficou presente nessa bova branch 16.0. Eu ainda não analisei a criticidade disso... Segue o warning:
|
TLDR : YES, YOU NEED TO CLONE THE OCA/l10n-brazil 16.0 BRANCH AGAIN!
@mileo from KMEE did a bad migration process in #2164 and as a result the first 500 commits in l10n_br_base were missing. In fact he also screwed even the 15.0 branch in #2194 were some 500 commits were also missing. He tried to experiment with oca-port without understanding it instead of following the process in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-15.0 and https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-16.0
This resulted in a huge part of the project history that is trashed but more importantly, this screws the git blame code explanations and this prevents tools like oca-port to do their commit porting job properly.
The result is both branches 15.0 and 16.0 have their git history broken in ways it's impossible to fix with a new PR.
The only solution is to force-push new branches. Here in this issue I'm focusing on 16.0 as this is the priority, this is what will be propagated to 17.0 and to 18.0 later so it has to be fixed the sooner the better.
So basically we will need to force push the new 6.0-mig-l10n_br_base in place of the current 16.0 branch (it's backed up in 16.0-backup )
Here is the process I used to reconstruct 16.0-mig-l10n_br_base (yup it took me 2 days to fix your newest shit in the project @mileo and it's far from being the first big shit you did in the project, I hope won't force me to detail it again)
@renatonlima @marcelsavegnago @antoniospneto can can you please review 16.0-mig-l10n_br_base carefully so we can force push it into the new 16.0 branch?
If you compare it with the current 16.0 branch, you should only see differences in l10n_br_base due to these missing commits: #3487
After we do the replace, all the 16.0 clones will need to be done again on all machines and all PR to the 16.0 branch will need to be reconstructed from new clones and cherry-picking the commits in the former PRs. 16.0 is the top priority, but eventually we fix the 15.0 branch after that. (yup thank once again for your great initiatives in the project @mileo what would we do without you I wonder)
The text was updated successfully, but these errors were encountered: