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

WP-r45134: Emoji: Update Twemoji to version 12.0.0. #416

Draft
wants to merge 1 commit into
base: develop
from

Conversation

Projects
None yet
3 participants
@Mte90
Copy link
Collaborator

commented Apr 24, 2019

I used the backport script but seems that didn't set the text of the commit.
I can do a fix later but this is the code merged for #413.

@Mte90 Mte90 requested a review from nylen Apr 24, 2019

@nylen

This comment has been minimized.

Copy link
Member

commented Apr 25, 2019

When there is a conflict you need to use git cherry-pick --continue to set the correct text. This is explained in the script's output.

@nylen
Copy link
Member

left a comment

From #413 (comment):

I would like for us to make a PR where we backport all emoji-related changes from WP to CP

There are many more changesets that need to be ported first, just porting the latest changeset will probably break the emoji code.

When I took a quick look at the logs, I saw at least 5 changesets that we need to port. They also need to be ported in order, in the same PR.

@Mte90

This comment has been minimized.

Copy link
Collaborator Author

commented Apr 26, 2019

I found only that changeset on https://bots.classicpress.net/branches/wp-trunk
In the other version I didn't find any other commit that regards twemoji update.
I can close this one and work on a new one if I found the changeset :-)

@nylen

This comment has been minimized.

Copy link
Member

commented Apr 26, 2019

You can go to https://bots.classicpress.net/branches/wp-trunk and Ctrl+F for "emoji". There are 39 matches. Most, but not all, of these changesets will need to be ported over, starting with the oldest - it depends on what each changeset is doing.

There may also be a few other changesets to port over from the other branches, but they might all be covered by pulling from trunk. I'm not sure. Hopefully there aren't any other changesets that do not mention "emoji" in their commit message.

When you use the backport script to put multiple changesets in the same PR, you can create a branch first, then use the -c option to do the backport in the current branch:

 Usage: bin/backport-wp-commit.sh [-c] [-v] WP_CHANGESET_NUMBER

  WP_CHANGESET_NUMBER   The SVN changeset number to port.  If this change depends
                        on other changes, make sure they have already been ported.
> -c, --current-branch  Apply the commit directly to the current branch instead of
>                       creating a new branch.
  -v, --verbose         Show intermediate commands and their output.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.