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

BUG remove memory leak in array ufunc override. #9093

Merged

Conversation

mhvk
Copy link
Contributor

@mhvk mhvk commented May 10, 2017

Backport of #9092.

#@charris - is this what you meant by backporting?

@charris
Copy link
Member

charris commented May 10, 2017

Yep. The easy way to do these once the backport branch has diverged and after deleting the origin branch is

git rebase --onto maintenance/1.13.x HEAD^
git push origin HEAD

Might not need to delete that origin branch, a force push might suffice. The only drawback is that you might need to switch to the branch in order to make the new PR, github will not always show it up top like it usually does.

@juliantaylor
Copy link
Contributor

even better, for the original PR to:

git rebase --onto $(git merge-base master maintenance/1.13.x) HEAD^

that way you don't even create a new commit for the backport, just create a new PR from the same branch.

@charris charris merged commit 5d9a536 into numpy:maintenance/1.13.x May 10, 2017
@charris
Copy link
Member

charris commented May 10, 2017

Thanks Marten.

@mhvk
Copy link
Contributor Author

mhvk commented May 10, 2017

OK, I'll try the git-fu next time!

@eric-wieser
Copy link
Member

eric-wieser commented May 10, 2017

@juliantaylor, @charris: In the interest of making the shared-commit-style backports easier, can we tag the branch-point?

merge-base master maintenance/1.13.x isn't particularly reliable, as:

  • it can move back if people fixup old PRs to merge into both.
  • it can move forwards to a shared backport commit

@charris
Copy link
Member

charris commented May 11, 2017

I've considered tagging the branch point, but I don't agree that rebasing onto the branch is a hassle. Unless it fails, of course. I actually prefer it to Julian's suggestion and the link graph of the repo is much simpler.

@charris
Copy link
Member

charris commented May 11, 2017

BTW, there is some git fu to find the branch point, although I wouldn't call it straight forward. Apparently merge-base cannot be relied upon for that purpose.

@mhvk mhvk deleted the array-ufunc-ref-count-bug-1.13 branch August 31, 2017 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants