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

go back to the 1.1.x results list #1930

Merged
merged 1 commit into from Sep 26, 2014
Merged

go back to the 1.1.x results list #1930

merged 1 commit into from Sep 26, 2014

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Sep 25, 2014

temporary so 1.2.0 doesn't break under Yosemite

See this comment.

temporary so 1.2.0 doesn't break under Yosemite
@pjrobertson
Copy link
Member

pjrobertson commented Sep 25, 2014

With our current man power this is probably the best option to take. Did you do a simple revert? Hopefully we can continue this when we're doing 2.0 :)

@skurfer skurfer added this to the 1.2.0 milestone Sep 25, 2014
@skurfer
Copy link
Member Author

skurfer commented Sep 25, 2014

Ha. Nothing that sophisticated. I checked out 3bcc772, copied the NIB to /tmp, checked out master, and copied it back. I didn’t have to revert any code (thankfully).

When we start moving toward 2.0.0, we can just copy the updated NIB from #1924.

@pjrobertson
Copy link
Member

pjrobertson commented Sep 26, 2014

Hmmm... the 'bad' commit was 96d7de7 so I'd have checked that one out and used the results view from there. Otherwise we be going back too far in history.

@skurfer
Copy link
Member Author

skurfer commented Sep 26, 2014

If that’s the bad commit, then I wouldn’t want to use it, right? Did you mean to say 4c2d7a6 was the bad commit? I just looked for a mention of AutoLayout, which was in 96d7de7, then went back to the one before that.

And by “one before”, I mean in the list generated by git log Nibs/ResultWindow.xib. Yes, there were a lot of others in between, but none of them touch that file. That’s why I was OK with going back so far.

@pjrobertson
Copy link
Member

pjrobertson commented Sep 26, 2014

Yeah you're right actually badcommit~1 when only considering ResultsWindow.xib is 3bcc772 (I was thinking of the global log and then going back 1 commit)

Fine! :)

pjrobertson added a commit that referenced this pull request Sep 26, 2014
go back to the 1.1.x results list
@pjrobertson pjrobertson merged commit 0a57b21 into master Sep 26, 2014
@pjrobertson pjrobertson deleted the oldresults branch Sep 26, 2014
skurfer added a commit that referenced this pull request Sep 26, 2014
@philostein
Copy link
Contributor

philostein commented Oct 4, 2014

Works in 400E now, thanks

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.

None yet

3 participants