Bill, thanks so much for fixing it! Nomi On Sep 24, 2013, at 3:44 PM, William Riehl <[email protected]> wrote:
Okay, here's what I did. (Thanks for the pointers, Steve!)
We wanted to revert the commit that caused problems, so I dug up the commit id through the git page: https://git.kbase.us/docs.git (this commit, in particular: https://git.kbase.us/docs.git/commit/45afaddde56463c2718ea85482e6d023761ec3a...). Then:
git revert <commit id>
This command is essentially an undo for a commit, and sets the HEAD to the state of the repo right before that commit. Then, it was a matter of adding that new release notes file that was about to be staged:
git add networks/release-notes.txt
Then a usual commit and push.
It's going to take a couple minutes, though to go through, apparently it wants to update everything. And any commits after that will likely be wiped out, but it shouldn't be too much work to restore them, since the changes are still part of the git logs.
Not a big deal, and that's why we use version control. :) Hope this helps!
- Bill
On Tue, Sep 24, 2013 at 2:57 PM, Thomas Brown <[email protected]> wrote: Please let me know how it ws done.
----- Original Message ----- From: "Sarah Poon" <[email protected]> To: "Neal Conrad" <[email protected]>, "William Riehl" <[email protected]> Cc: "Thomas Brown" <[email protected]>, "Thomas Brettin" <[email protected]>, "Dan Olson" <[email protected]>, "Nomi Harris" <[email protected]>, "Elizabeth Marie Marland Glass" <[email protected]>, [email protected] Sent: Tuesday, September 24, 2013 4:53:41 PM Subject: Re: [Release-team] Tutorial links from Services page all broken
Bill is going to help fix the git repo, if that's ok
On Tue, Sep 24, 2013 at 2:51 PM, Neal Conrad < [email protected] > wrote:
I would have ran this by now, but i screwed up my working local repo... and to reclone involves downloading 2gig of data.
On Sep 24, 2013, at 4:50 PM, Thomas Brown wrote:
I'm looking at: http://stackoverflow.com/questions/9764288/git-reset-to-previous-commit
----- Original Message ----- From: "Thomas Brettin" < [email protected] > To: "Neal Conrad" < [email protected] > Cc: "Dan Olson" < [email protected] >, "Nomi Harris" < [email protected] >, "Elizabeth Marie Marland Glass" < [email protected] >, "Thomas Brown" < [email protected] >, "Sarah Poon" < [email protected] >, [email protected] Sent: Tuesday, September 24, 2013 4:48:18 PM Subject: Re: [Release-team] Tutorial links from Services page all broken
Not sure, but it seems plausible. You'll need to push the changes to git.kbase.us ,
t
On Sep 24, 2013, at 4:46 PM, Neal Conrad < [email protected] > wrote:
Tom Brown accidently removed all the docs from the repo.
Anybody know how to easily revert? is it git revert -n master~3 to go back 3 commits?
Thanks,
Neal
On Sep 24, 2013, at 4:42 PM, Thomas Brettin wrote:
Looping Elizabeth in on this. Please include her.
On Sep 24, 2013, at 4:41 PM, Nomi Harris < [email protected] > wrote:
All of the tutorials seem to have disappeared from kbase.us . If you go to http://www.kbase.us/developer-zone/services/ and click on any of the Tutorial links (e.g., http://www.kbase.us/for-users/tutorials/analyzing-data/plant-genome-analysis... ) you get an error message:
Warning: readfile(docs/ontology_service/tutorials/ontology_tutorial.html): failed to open stream: No such file or directory in /var/www/ksite3/blocks/basic_test/view.php on line 4
Tom Brown, can you fix this ASAP? (I will also create a JIRA ticket.)
Thanks,
Nomi
_______________________________________________
Release-team mailing list