Perl 6 - the future is here, just unevenly distributed

IRC log for #webwork, 2013-01-28

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

All times shown according to UTC.

Time Nick Message
00:01 rbeezer joined #webwork
01:14 Paul_ joined #webwork
02:47 aubreyja joined #webwork
03:21 Paul_ joined #webwork
03:29 aubreyja mgage_: around?
03:30 mgage_ yep
03:30 mgage_ grading :-)
03:30 mgage_ aubreyja: hi
03:31 aubreyja is there an easy way to merge a branch into multiple branches? I keep merging e.g. webwork2-dev/master into webwork2/master, ww2.5.1.1 or pg-dev/master into pg/master.pg2.5.1...
03:32 mgage_ I don't think so with github -- I think you need a pull request for each branch.
03:32 aubreyja For example, I just sent a pull request to pg-dev/master, but I'll want to merge it into pg/master and pg/pg2.5.1...
03:32 mgage_ I've been cutting down on the number of branches for other reasons as well.
03:33 mgage_ I think git itself allows multiple merges but I haven't worked out the details
03:33 aubreyja that would be ideal, I'll look around
03:36 aubreyja oh, and I meant 'sent to webwork2-dev/master…merge into webwork2/master webwork2/ww2.5.1.1 webwork2/2.5.2 (and it should really go out to those branches in webwork2-dev too..)
03:42 mgage_ I'm thinking of trying just using master and devel for a while -- I put a devel in webwork2-dev  -- so devel has all of the stuff
03:42 mgage_ from JJ and from Peter Staab
03:44 mgage_ I'll keep master and ww2.5.1.1 synced until we're ready for the something passed ww2.5.1.3  --
03:44 mgage_ we'll see if that makes things easier
03:46 aubreyja that sounds reasonable - so, webwork2-dev/master and webwork2-dev/devel.  Then at some point webwork2-dev/master gets new features from webwork2-dev/devel and we move that over to webwork2 as a release branch?
03:48 mgage_ yes,    -- and in the future, just before a release to master we will have  ww2.5.x or something like that -- which will go away once it is tested.  This is Davide's model -- I think it works pretty well for developers.
03:49 mgage_ I don't think it is going to be sufficient for getting our release tested in front of classes before we move it over to master and webwork2/master    -- but it's a start
03:52 aubreyja well, we should put together a list of people who we can expect to run the webwork2-dev/ww2.5.x branch for a while before we move it over, and maybe we can designate, say, ftcourses as the test+ server - it gets code later than test, and after a bit of testing by others, but before the other maa servers...
03:57 mgage_ something like that -- to keep developing quickly we need fairly fast testing and by enough people so that they don't wear out.
03:58 mgage_ For example if I'm teaching only upper level courses for a semester I can't do a good job of testing.
04:00 aubreyja sure - it would be nice to find a way to run particular courses on specific git branches…so, for example, I could run my courses on irresponsibly new code, but I don't have to worry about wrecking other peoples courses on my server
04:01 mgage_ yes -- that would be a big help -- but I think you need at least separate apache servers (hence separate ports)
04:03 aubreyja yeah, probably
08:37 djun joined #webwork
12:23 mgage_ joined #webwork
13:07 dpvc joined #webwork
13:56 goehle joined #webwork
14:47 aubreyja joined #webwork
15:11 rbeezer joined #webwork
18:24 aubreyja joined #webwork
18:55 dpvc joined #webwork
19:03 aubreyja joined #webwork
20:17 aubreyja_ joined #webwork
20:29 djun joined #webwork
21:38 djun joined #webwork
23:26 djun joined #webwork

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