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

Fix git mixup from ticket #17556 #17731

Closed
orlitzky opened this issue Feb 5, 2015 · 12 comments
Closed

Fix git mixup from ticket #17556 #17731

orlitzky opened this issue Feb 5, 2015 · 12 comments

Comments

@orlitzky
Copy link
Contributor

orlitzky commented Feb 5, 2015

In ticket #17556 it looks like we only got the commit from Ralf's fix to the Sage Gymnasium.

I think my branch should still be good, but I can't reopen that ticket.

CC: @rwst @kcrisman @vbraun

Component: symbolics

Branch/Commit: u/mjo/ticket/17731 @ d27f849

Reviewer: Michael Orlitzky

Issue created by migration from https://trac.sagemath.org/ticket/17731

@orlitzky orlitzky added this to the sage-6.5 milestone Feb 5, 2015
@kcrisman
Copy link
Member

kcrisman commented Feb 5, 2015

comment:1

I'm not sure it works - I can't click on the branch and the mouseover text says "Already merged". Interesting. Volker, any clues here?

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 5, 2015

Branch pushed to git repo; I updated commit sha1. New commits:

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 5, 2015

Changed commit from 044db1d to d27f849

@orlitzky
Copy link
Contributor Author

orlitzky commented Feb 5, 2015

comment:3

I think the branch got deleted after the ticket was closed, but I still have it locally. I just rebased it on develop and pushed it, let's see what happens.

@orlitzky
Copy link
Contributor Author

orlitzky commented Feb 5, 2015

Changed branch from u/mjo/ticket/17556 to u/mjo/ticket/17731

@orlitzky
Copy link
Contributor Author

orlitzky commented Feb 5, 2015

comment:4

Let's try that again.

@kcrisman
Copy link
Member

kcrisman commented Feb 5, 2015

comment:5

Still shows as merged.

@orlitzky
Copy link
Contributor Author

orlitzky commented Feb 5, 2015

comment:6

Sorry Volker, I think this was a false alarm. In ticket #15346 it looked like we were missing a commit from #17556. But really what happened was that one of the develop branch merges deleted lines out from under Ralf, and they wound up being added back rather than getting removed from his branch.

@rwst
Copy link

rwst commented Feb 5, 2015

comment:7

I'm pretty sure the problem is confined to #15346, and it's up to me to offer apologies.

@kcrisman
Copy link
Member

kcrisman commented Feb 5, 2015

comment:8

So ... close this?

@kcrisman
Copy link
Member

kcrisman commented Feb 5, 2015

Changed reviewer from Ralf Stephan to Michael Orlitzky

@kcrisman
Copy link
Member

kcrisman commented Feb 5, 2015

Changed author from Michael Orlitzky to none

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

No branches or pull requests

4 participants