[MIG] mail_attach_existing_attachment: Migration to 18.0 #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently translated at 100.0% (5 of 5 strings) Translation: social-14.0/social-14.0-mail_thread_create_nolog Translate-URL: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_thread_create_nolog/es/
Followers of a discussion in the chatter of Odoo can be informed by email of a new message being created. This module adds in that email the history of the chatter discussion to help the recipient with more context.
Currently translated at 100.0% (7 of 7 strings) Translation: social-14.0/social-14.0-mail_notification_with_history Translate-URL: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_notification_with_history/es/
Signed-off-by sebalix
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: social-18.0/social-18.0-mail_thread_create_nolog Translate-URL: https://translation.odoo-community.org/projects/social-18-0/social-18-0-mail_thread_create_nolog/
Currently translated at 100.0% (2 of 2 strings) Translation: social-18.0/social-18.0-mail_thread_create_nolog Translate-URL: https://translation.odoo-community.org/projects/social-18-0/social-18-0-mail_thread_create_nolog/it/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: social-16.0/social-16.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_attach_existing_attachment/
Currently translated at 66.6% (2 of 3 strings) Translation: social-16.0/social-16.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_attach_existing_attachment/it/
Currently translated at 100.0% (3 of 3 strings) Translation: social-16.0/social-16.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_attach_existing_attachment/es/
Currently translated at 100.0% (3 of 3 strings) Translation: social-16.0/social-16.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_attach_existing_attachment/it/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: social-16.0/social-16.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_attach_existing_attachment/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: social-17.0/social-17.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-17-0/social-17-0-mail_attach_existing_attachment/
Currently translated at 100.0% (4 of 4 strings) Translation: social-17.0/social-17.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-17-0/social-17-0-mail_attach_existing_attachment/it/
Currently translated at 100.0% (4 of 4 strings) Translation: social-17.0/social-17.0-mail_attach_existing_attachment Translate-URL: https://translation.odoo-community.org/projects/social-17-0/social-17-0-mail_attach_existing_attachment/it/
[MIG] mail_attach_existing_attachment: Migration to 18.0
|
I'm afraid you have lost here the commit history. You should change the commands to have the source branch on the other repo and the target branch in this one. |
fredericgrall
force-pushed
the
18.0-mig-mail_attach_existing_attachment
branch
from
2138d35 to
8a83916
Compare
|
@pedrobaeza, I'm sorry to bother you, can you help me? I changed the destination but when I want to create the pull request, github sees pull request #22 and doesn't allow me to create a new one. Sorry again |
|
From scratch, these are the commands to get the commit history in this repository (assuming you have SSH key in GitHub - if not, replace by https URLs and put credentials each time -): git clone [email protected]:OCA/mail.git -b 18.0
cd mail
git remote add social [email protected]:OCA/social.git
git fetch social 17.0
git format-patch --keep-subject --stdout origin/18.0..social/17.0 -- mail_attach_existing_attachment | git am -3 --keep
... |
|
@pedrobaeza thank you, but my problem is when i want create new pull request |
|
That's because you have pushed the mail branch to this repository, which has a totally different commit history, as said in the bottom line. Do the steps as I have put to retrieve the commit history in this repository history. |
|
@pedrobaeza thanks for your help, it's corrected |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.