Skip to content

bpo-26506: hex() documentation: mention %x % int #2525

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

Merged
merged 1 commit into from
Jul 6, 2017

Conversation

manvi77
Copy link
Contributor

@manvi77 manvi77 commented Jul 1, 2017

bpo-26506: hex() documentation: mention %x % int

@mention-bot
Copy link

@manvi77, thanks for your PR! By analyzing the history of the files in this pull request, we identified @birkenfeld, @benjaminp and @brettcannon to be potential reviewers.

@Mariatta Mariatta self-assigned this Jul 6, 2017
@Mariatta Mariatta merged commit 67ba4fa into python:master Jul 6, 2017
@Mariatta
Copy link
Member

Mariatta commented Jul 6, 2017

Thanks @manvi77 and congrats on your first contribution to CPython 🎉

Can you please backport this to the 3.6 branch?
You can use cherry_picker.

Thanks.

@manvi77
Copy link
Contributor Author

manvi77 commented Jul 6, 2017

Thanks @Mariatta, I will check to backport this to 3.6 branch on this weekend.

@manvi77
Copy link
Contributor Author

manvi77 commented Jul 18, 2017

@Mariatta , While I am trying backport to 3.6 using cherry_picker ((venv) ~/mypython/cpython @ (Manvisha) | =>cherry_picker 67ba4fa 3.6), got following error

Now backporting '67ba4fa467ffff825d6a0c0a21cc54ff1df2ed1b' into '3.6'
Switched to a new branch 'backport-67ba4fa-3.6'
Branch backport-67ba4fa-3.6 set up to track remote branch 3.6 from upstream.

[backport-67ba4fa-3.6 99eec92c12] bpo-26506: hex() documentation: mention %x % int (GH-2525)
Date: Thu Jul 6 22:30:58 2017 +0300
1 file changed, 52 insertions(+), 10 deletions(-)

Failed to push to origin ☹
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

Deleted branch backport-67ba4fa-3.6 (was 5679e670a6).

branch backport-67ba4fa-3.6 has been deleted.

@Mariatta
Copy link
Member

@manvi77 Is origin set up to your own fork of CPython?

Can you tell me the result of this command when run from ~/mpython/cpython ?
Thanks

git remote -v

@manvi77
Copy link
Contributor Author

manvi77 commented Jul 24, 2017

@Mariatta
Copy link
Member

@manvi77 cherry_picker assumes that origin is set to track own fork of cpython.

In your case origin is set to python/cpython, which you don't have a permission to push to, so it failed.

You can use the --pr-remote option with cherry_picker:
The following should work for you:

$ git remote add pr https://github.com/manvi77/cpython.git
$ cherry_picker --pr-remote pr 67ba4fa467ffff825d6a0c0a21cc54ff1df2ed1b 3.6 

manvi77 added a commit to manvi77/cpython that referenced this pull request Jul 25, 2017
@manvi77
Copy link
Contributor Author

manvi77 commented Jul 25, 2017

@Mariatta , thank you and it worked :) . Is it all done?

@bedevere-bot
Copy link

GH-2870 is a backport of this pull request to the 3.6 branch.

@Mariatta
Copy link
Member

Thanks @manvi77
After pushing the backport branch, we need to create the backport PR.
I created GH-2870 from your branch.

Mariatta added a commit that referenced this pull request Jul 25, 2017
@Mariatta Mariatta removed their assignment Jun 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants