Perl 6 - the future is here, just unevenly distributed

IRC log for #webwork, 2013-02-06

| Channels | #webwork index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
09:19 rbeezer joined #webwork
13:50 dpvc joined #webwork
14:21 dpvc joined #webwork
14:22 goehle joined #webwork
14:29 aubreyja joined #webwork
15:28 rbeezer joined #webwork
15:40 aubreyja left #webwork
16:08 aubreyja joined #webwork
17:32 djun joined #webwork
17:34 aubreyja mgage_ aournd?
17:35 mgage hi
17:35 aubreyja pm
21:22 djun joined #webwork
21:32 aubreyja mgage - I've got your ww2.5.1.3 branch running now on webwork-dev.missouri.edu
22:30 darwyn joined #webwork
22:38 aubreyja Hi darwyn
22:38 darwyn Hi!
22:38 darwyn so there are two files that need to be posted
22:38 rbeezer Is hosted2 a bit messed up?  I had a student who was inputting correct answers, but getting erros on submission, and right now I cannot view problems in Library Browser 2, they all raise errors and do not render
22:39 darwyn one is a pg macro file
22:39 mgage aubreyja: cool
22:39 darwyn the other is a one line modification to global.conf
22:39 mgage let me check -- I was working with it earlier.   just a second
22:39 aubreyja darwyn: ok, do you have a github account
22:39 darwyn I do, we set it up this summer
22:40 rbeezer thanks, mike
22:40 aubreyja cool - so in your pg/ dir what does 'git remote -v' say
22:41 aubreyja (and same in webwork2)
22:42 darwyn oops, going to have to install git
22:43 aubreyja mgage - I didn't see knowls for solutions btw do I have to enable that?
22:43 aubreyja ok, np
22:43 aubreyja is this on your ubuntu machine from this summer - it should be on there already I would think
22:44 darwyn no, although I could just as easily use that. I was working off from our production server which has a fresh webwork install
22:45 darwyn let me try the machine from this summer quick
22:45 aubreyja ah, fresh from svn install?  If so, it might be easier to use the ubuntu machine
22:46 darwyn yeah
22:48 darwyn ok, on the ubuntu machine in pg I get
22:48 aubreyja ok, I suggest either using the ubuntu machine or at least doing a fresh clone of pg-dev and webwork2-dev from github into your home dir and adding your changes there
22:48 darwyn there are two files that are changed/added: one is a new pg macro file, and the
22:49 mgage rbeezer: ok -- should be ok now -- stupid comma,
22:49 aubreyja what is your github username darwyn?
22:50 rbeezer Thanks, Mike - glad it was an easy fix.  I'll let the student know.  (What great service!)  Off to a meeting...
22:50 mgage the CSS is going to look different -- and will often behave better although I notice that there is one weirdness on Library browser 2 that has to be fixed.  You can send me email notes about the css if you wish.
22:50 mgage ttyl
22:50 darwyn darwyncook
22:50 aubreyja I found it - darwyncook
22:51 goehle hey
22:51 aubreyja hi geoff
22:51 goehle does someone know if you can use git to diff between branches
22:51 goehle I wanted to take al ook at mikes stuff on 1.5.3
22:52 goehle sorry 1.5.1.3
22:52 aubreyja I've googled it and the results seem to imply it's possible, but I've never actually done it
22:52 darwyn ok, so on the ubuntu machine in pg I get a a fetch and a push from 'git remote -v'
22:52 aubreyja I think you can just refer to two different sha1 stems even if they are in different branches
22:52 darwyn in the webwork2 directory I get not a git repository
22:53 goehle ok
22:53 goehle I'll try it out
22:53 aubreyja ok, let's get the pg macro file up to your pg-dev first
22:53 aubreyja can you do 'git status' and 'git remote -v' in your pg did?
22:53 aubreyja dir?
22:54 mgage aubreyja: no knowls for solutions and hints yet (the hooks are in however) -- but there are nice knowls for the help files.    pulls my gage_test repo -- I'm collecting unit tests -- we should make a group version of that repo
22:55 darwyn git status shows the file PDLmacros.pl which needs to be uploaded
22:56 darwyn git remote -v shows git@github.com:darwyncook/pg-dev.git (fetch)
22:56 darwyn and same thing as above but with push instead of fetch
22:57 aubreyja ok, good -
22:57 mgage goehle:  github has a nice gui that does this -- click on the branches tab when you are looking at a repo -- you get something like this https://github.com/mgage/webwork2-dev/branches
22:57 mgage and you can compare to see the differences.
22:58 aubreyja darwyn:  First do git commit -a -m'Helpful log message' inside pg-dev
22:58 darwyn ls
22:59 mgage If you are using sourceTree -- it also has a nice gui that allows you to command click on two commits and get differences.
22:59 mgage the command line versions still confuse me.
22:59 aubreyja mgage: should I have darwyn rebase onto openwebwork/pg-dev first? It doesn't seem that important since he's just adding a new file and not changing an existing one.
22:59 mgage something like   git log branch1 ... branch2 works but I forget if it's two dots or three
23:00 aubreyja (before pushing and doing a pull request)
23:00 mgage you can see if his pull request will merge cleanly -- if it doesn't then you'll need to rebase.
23:00 aubreyja kk
23:00 darwyn jason: where is pg-dev?
23:01 aubreyja ah, it's just your pg directory - sorry - just run that commit command inside pg/
23:02 darwyn ok, so I got "nothing added to commit but untracked files present ...
23:02 aubreyja ah, which files are untracked?
23:03 darwyn and it lists PDLmacros.pl
23:03 darwyn which is the one we want of course
23:03 aubreyja ok, did you do 'git commit -a -m'Helpful log message' with both -a and -m?
23:04 darwyn yup, is there a space after the m?
23:04 aubreyja sorry, never mind -a doesn't work for untracked files.
23:04 aubreyja so first do git add .
23:05 aubreyja then do git commit -m'Helpful log message'
23:05 darwyn oh, well I did it with the -a
23:06 darwyn I got 2 files changed, 47 insertions, 0 deletions
23:06 aubreyja that's ok
23:06 aubreyja I thought there was just one file.  What was the other one?
23:07 darwyn i wasnt paying attention, there is a backup file PDLmacros.pl~
23:08 aubreyja ah, that's ok.  Just do git rm PDLmacros.pl~
23:08 aubreyja then git add . then git commit -m'clearning up...'
23:10 darwyn hmm, git rm returned fatal: pathspec 'PDLmacros.pl~ did not match any files
23:11 aubreyja what does git log say about what you committed?
23:12 goehle ooc whats the difference between nfreeze and freeze?
23:12 mgage I think git reset --hard PDLmacros.pl~  will restore the situation.  Just make sure everything is spelled right :-)
23:12 goehle nm foudn it
23:12 mgage nfreeze is more robust across systems
23:12 goehle right
23:12 mgage don't actually know the details
23:14 darwyn the git logs date back to august, with no end in sight :) going to try Mike's solution
23:15 goehle one issue I'm seeing is that I beleive I fixed a bug having to do with blank weights in ProblemSetDetail that seems to be missing
23:15 mgage aubreyja: goehle:  github is worth exploring -- two things I have found are the "blame" tab when you are viewing a file   and the "compare" buttons when you are using the "branches" tab
23:15 mgage not impossible,  about when did you fix it?
23:15 goehle last semester I think
23:15 aubreyja sounds good darwyn
23:15 goehle it was an issue where weights were getting set to zero for some reason
23:16 mgage kk -- I've just packed up my laptop since I'm on my way home but I'll look to see if one of those commits got lost.  what file is it in?
23:17 goehle hmm
23:17 goehle actually I think its missing from *my* repo
23:17 goehle what the hey
23:17 goehle oh wait, now I remember
23:17 goehle it was an issue with assignment and 0 as a variable and 0 as a string
23:18 darwyn Mike's solution returned "'PDLmacros.pl~': unknown revision or path not in the working tree."
23:18 aubreyja ok, maybe PDLmacros.pl was never there
23:18 aubreyja let's just have you push it up to github and then I can look at it
23:19 aubreyja so, just do 'git push'
23:19 goehle right,a dn we had to use defined or  //
23:19 mgage goehle: https://github.com/mgage/webwork2-dev/commits/ww2.5.1.1  lets us track the commits
23:20 goehle yeah
23:20 goehle that was the fix
23:20 goehle I didn't use // but I added the unless defined stuff
23:20 mgage here is what I wanted:  history of that file:  https://github.com/mgage/webwork2-dev/commits/ww2.5.1.1/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
23:21 aubreyja oh, and I meant PDLmacros.pl~
23:21 aubreyja was maybe never there
23:22 goehle I wonder why its not in *my* git
23:22 goehle they were my changes afterall
23:22 mgage is this the change you were talking about? https://github.com/mgage/webwork2-dev/commit/f3320e5331e8c7f4ef649b08250663f0f9cc9f99
23:22 goehle yeah
23:22 mgage well, let's see if it's still there in ww2.5.1.3 (perhaps your git is a bit different from the openwebwork repo)
23:23 goehle ah interestin
23:23 goehle interesting
23:23 goehle so the fixed uninitialized variable stuff is in my ww2.5.1.1 branch
23:24 goehle I dont know why it didn't make it to my master branch though
23:24 aubreyja Hey darwyn - I've got to pack up and get home, but email me and let me know if git push works or not and I'll get back to you later tonight
23:25 mgage we're trying to standardize things so that it's not so confusing make sure the commits get propagated to all of the branches.
23:25 darwyn ok, had a moment remembering the password ... It seemed to worj though
23:25 goehle yeah, but its up to me to make sure my own git is in order
23:25 goehle so my bad
23:25 goehle but I did find a recent upgrade you probably dont have
23:25 goehle which is when you use essay questions it can highlight your essay answer as red, even though its technically ungraded
23:26 aubreyja great - it will work the same for webwork2: First fork webwork2-dev from openwebwork into your github, then clone it, then make your changes, then do git add, git commit, then git push
23:26 darwyn sounds good!
23:26 aubreyja just email me or ping me on irc later if you run into any trouble
23:27 aubreyja ttyl
23:27 aubreyja left #webwork
23:28 mgage if you can rebase (reconcile somehow) your system with ww2.5.1l3 you submit your fix on that to openwebwork -- sounds like a minor fix.
23:28 mgage major fixes should be submitted on openwebwork   devel branch
23:28 mgage we're trying to leave  ww2.5.1.1 completely alone now
23:29 goehle yeah its pretty minor
23:29 mgage so that people who like living with the bugs they are used to can use it.
23:30 mgage need to head home now -- ttyl
23:36 goehle is there a way to issue a pull request for single file
23:36 goehle I've tried my best but my machine seems to be ahead/different than openwebwork/ww2.5.1.3 in some ways
23:37 goehle (its missing lbtwo.template files for example)

| Channels | #webwork index | Today | | Search | Google Search | Plain-Text | summary