Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[3.6] bpo-30217: add the operators ~ and | to the index (GH-1502)#2136

Merged
Mariatta merged 1 commit into
python:3.6python/cpython:3.6from
marco-buttu:backport-dc980df-3.6Copy head branch name to clipboard
Jun 12, 2017
Merged

[3.6] bpo-30217: add the operators ~ and | to the index (GH-1502)#2136
Mariatta merged 1 commit into
python:3.6python/cpython:3.6from
marco-buttu:backport-dc980df-3.6Copy head branch name to clipboard

Conversation

@marco-buttu

@marco-buttu marco-buttu commented Jun 12, 2017

Copy link
Copy Markdown
Contributor

Backport of #1502

@Mariatta Mariatta changed the base branch from master to 3.6 June 12, 2017 17:25
@Mariatta

Mariatta commented Jun 12, 2017

Copy link
Copy Markdown
Member

Since this is a backport, I changed the base to 3.6 instead of master.

@Mariatta Mariatta changed the title Backport dc980df 3.6 [3.6] bpo-30217: add the operators ~ and | to the index Jun 12, 2017
@serhiy-storchaka

serhiy-storchaka commented Jun 12, 2017

Copy link
Copy Markdown
Member

How you did this @Mariatta?

@Mariatta

Mariatta commented Jun 12, 2017

Copy link
Copy Markdown
Member

@serhiy-storchaka, next to the PR title, you should see the Edit button. I clicked on it:

screen shot 2017-06-12 at 11 18 04 am

There you can change the base branch:

screen shot 2017-06-12 at 11 18 12 am

screen shot 2017-06-12 at 11 18 21 am

screen shot 2017-06-12 at 11 18 12 am

Hope this helps :)

There's a bug with cherry_picker.py, when it could not detect the proper maintenance branch, it selected the master branch. I think that's what happened here. I'll need to work on a solution for it.

@Mariatta

Mariatta commented Jun 12, 2017

Copy link
Copy Markdown
Member

But travis seems to hang? Not sure how we can retrigger it.

@Mariatta Mariatta closed this Jun 12, 2017
@Mariatta Mariatta reopened this Jun 12, 2017
@Mariatta

Mariatta commented Jun 12, 2017

Copy link
Copy Markdown
Member

Seems like closing and reopening the PR will retrigger travis build.

@serhiy-storchaka

serhiy-storchaka commented Jun 12, 2017

Copy link
Copy Markdown
Member

I used the Edit button for editing the title but didn't notice the possibility of changing the basic branch. Thank you @Mariatta, now I came to know something new. It may help me once. 😄

@Mariatta Mariatta added the docs Documentation in the Doc dir label Jun 12, 2017
@Mariatta Mariatta merged commit f59cac4 into python:3.6 Jun 12, 2017
@Mariatta Mariatta changed the title [3.6] bpo-30217: add the operators ~ and | to the index [3.6] bpo-30217: add the operators ~ and | to the index (GH-1502) Jun 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mariatta Mariatta Mariatta approved these changes

Assignees

No one assigned

Labels

docs Documentation in the Doc dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@marco-buttu @Mariatta @serhiy-storchaka @the-knights-who-say-ni
Morty Proxy This is a proxified and sanitized view of the page, visit original site.