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

[16.0][FIX] l10n_it_delivery_note: removed cli migration from l10n_it_ddt #3824

Merged

Conversation

stenext
Copy link

@stenext stenext commented Jan 9, 2024

Ho rimosso il codice del comando per migrare da l10n_it_ddt a l10n_it_delivery_note e le istruzioni dal readme perchè è possibile usarlo solo nelle versioni precedenti alla 16.0 di Odoo.
Se ne parla qui https://discord.com/channels/753902328494424064/806815905006223411/1193961656720556117 e qui #3285

@OCA-git-bot
Copy link
Contributor

Hi @MarcoCalcagni,
some modules you are maintaining are being modified, check this out!

Copy link

There hasn't been any activity on this pull request in the past 4 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 PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Jun 16, 2024
@sergiocorato
Copy link
Contributor

/ocabot rebase

@sergiocorato
Copy link
Contributor

Non mi è chiaro perché c'è il messaggio Conflicting files

@SirAionTech
Copy link
Contributor

Non mi è chiaro perché c'è il messaggio Conflicting files

Il merge del branch di questa PR in 16.0 ha dei conflitti perché dalla base comune (d3848a9) alcuni file sono stati modificati sia in 16.0 che nel branch di questa PR.

Per risolvere l'autore può fare un rebase del branch di questa PR su 16.0.

@francesco-ooops
Copy link
Contributor

l10n_it_delivery_note/init.py

USAGE è stato migrato a .md

@OCA-git-bot
Copy link
Contributor

@sergiocorato The rebase process failed, because command git rebase origin/16.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [FIX] l10n_it_delivery_note: removed cli migration from l10n_it_ddt
Using index info to reconstruct a base tree...
M	l10n_it_delivery_note/__init__.py
M	l10n_it_delivery_note/cli/migrate_l10n_it_ddt.py
A	l10n_it_delivery_note/readme/USAGE.rst
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): l10n_it_delivery_note/readme/USAGE.rst deleted in HEAD and modified in [FIX] l10n_it_delivery_note: removed cli migration from l10n_it_ddt. Version [FIX] l10n_it_delivery_note: removed cli migration from l10n_it_ddt of l10n_it_delivery_note/readme/USAGE.rst left in tree.
CONFLICT (modify/delete): l10n_it_delivery_note/cli/migrate_l10n_it_ddt.py deleted in [FIX] l10n_it_delivery_note: removed cli migration from l10n_it_ddt and modified in HEAD. Version HEAD of l10n_it_delivery_note/cli/migrate_l10n_it_ddt.py left in tree.
Removing l10n_it_delivery_note/cli/core.py
Removing l10n_it_delivery_note/cli/__init__.py
Auto-merging l10n_it_delivery_note/__init__.py
CONFLICT (content): Merge conflict in l10n_it_delivery_note/__init__.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [FIX] l10n_it_delivery_note: removed cli migration from l10n_it_ddt
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".

@stenext stenext force-pushed the 16.0-fix-l10n_it_delivery_note-nocli branch from dcbdc9d to c580bde Compare June 18, 2024 12:21
@odooNextev
Copy link
Contributor

@sergiocorato ho fatto un rebase

@stenext stenext force-pushed the 16.0-fix-l10n_it_delivery_note-nocli branch from c580bde to 80d9046 Compare June 21, 2024 15:38
@odooNextev
Copy link
Contributor

@francesco-ooops non ricordo più se readme.rst e index.html debbano essere lasciati fuori dal commit perchè ci pensa automaticamente l'automatismo di Github
Me li ha generati automaticamente pre-commit e non me li lasciava togliere

@odooNextev
Copy link
Contributor

merge?

@sergiocorato
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 16.0-ocabot-merge-pr-3824-by-sergiocorato-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 425228d into OCA:16.0 Jun 24, 2024
5 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 9a85bc1. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged 🎉 stale PR/Issue without recent activity, it'll be soon closed automatically.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[16.0][BUG][l10n_it_delivery_note] Migrazione dati l10n_it_ddt
6 participants