Skip to content

Conversation

@prossahl
Copy link
Contributor

@prossahl prossahl commented Aug 9, 2013

closes #4519

@jreback
Copy link
Contributor

jreback commented Aug 9, 2013

@prossahl
pls do 1 pr per issue
create a new tracking branch off of current master to keep them separate

@jreback
Copy link
Contributor

jreback commented Aug 9, 2013

do

git checkout thisbranch
git checkout -b newbranch
git rebase -i <commit before 1211711>``
git push myfork newbranch

and delete the first 2 commits; this makes this branch independent

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't put this in a separate file, stick in tests/test_tseries.py

@prossahl
Copy link
Contributor Author

Abandoned. I'll resubmit this.

@cpcloud
Copy link
Member

cpcloud commented Aug 13, 2013

@prossahl should this be closed then?

@prossahl
Copy link
Contributor Author

@cpcloud Well without the change the segfault can still happen. I'll submit a new pull request as this one pulled in irrelevant changes.

@cpcloud
Copy link
Member

cpcloud commented Aug 13, 2013

you don't need to do that. do this

git reset HEAD~1
git stash
git fetch upstream
git reset --hard upstream/master
git stash pop
git commit -am'Your awesome commit message'
git push --force

@prossahl
Copy link
Contributor Author

Thanks v. much for your help but its a no go.
git stash results in "No local changes to save". git fetch upstream results in "fatal: 'upstream' does not appear to be a git repository"
I think that my git repo is so messed up it will be quicker to create a new account and start from the beginning...

@cpcloud
Copy link
Member

cpcloud commented Aug 13, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Segfault with pd.tslib.get_period_field

3 participants