| *** wbrady has joined #schooltool | 00:09 | |
| *** didymo has joined #schooltool | 01:28 | |
| *** wbrady has quit IRC | 02:16 | |
| *** eldar has quit IRC | 04:00 | |
| *** lisppaste5 has quit IRC | 04:29 | |
| *** didymo has quit IRC | 04:40 | |
| *** lisppaste5 has joined #schooltool | 04:42 | |
| *** didymo has joined #schooltool | 07:01 | |
| *** didymo has quit IRC | 09:40 | |
| *** ignas has joined #schooltool | 11:51 | |
| *** alga has joined #SchoolTool | 13:47 | |
| *** jelkner has joined #schooltool | 15:49 | |
| *** wbrady has joined #schooltool | 16:01 | |
| *** wbrady has quit IRC | 16:02 | |
| ignas | aelkner: are you there? | 16:53 |
|---|---|---|
| *** wbrady has joined #schooltool | 17:16 | |
| jelkner | wbrady: good morning! | 17:34 |
| *** wbrady_ has joined #schooltool | 17:35 | |
| *** wbrady has quit IRC | 17:36 | |
| *** aelkner_ has joined #schooltool | 17:38 | |
| *** aelkner has quit IRC | 17:41 | |
| *** wbrady_ has quit IRC | 17:43 | |
| *** wbrady has joined #schooltool | 17:43 | |
| Lumiere | wbrady: http://www.stripey.com/vim/spelling.html | 18:17 |
| *** ignas has quit IRC | 18:22 | |
| *** jelkner has quit IRC | 18:35 | |
| *** eldar has joined #schooltool | 18:41 | |
| *** mattva01 has joined #schooltool | 18:50 | |
| Lumiere | hi matt | 18:59 |
| mattva01 | hey | 19:00 |
| *** eldar has quit IRC | 19:09 | |
| *** aelkner_ has quit IRC | 19:11 | |
| *** eldar has joined #schooltool | 19:12 | |
| *** jelkner has joined #schooltool | 19:53 | |
| *** povbot` has joined #schooltool | 20:21 | |
| *** alga has quit IRC | 20:33 | |
| *** povbot has quit IRC | 20:45 | |
| *** jelkner_ has joined #schooltool | 21:30 | |
| jelkner_ | wbrady: u still here? | 21:30 |
| *** jelkner_ has quit IRC | 21:31 | |
| jelkner | will? | 21:31 |
| wbrady | hey | 21:32 |
| jelkner | we only have a half hour today | 21:32 |
| wbrady | for what? | 21:32 |
| jelkner | henry and tyler are here | 21:32 |
| wbrady | ahh | 21:32 |
| wbrady | they should get on some sort of IM or IRC so i can talk to them | 21:33 |
| jelkner | henry is pointing to me that they have completed the ipcop tutorial | 21:33 |
| wbrady | did they push? | 21:33 |
| jelkner | push? | 21:33 |
| jelkner | they are testers | 21:33 |
| jelkner | never mind | 21:33 |
| wbrady | they r writing the first lesson | 21:33 |
| jelkner | henry just told me he is helping to edit | 21:33 |
| wbrady | so they finished testing also? | 21:34 |
| jelkner | hold on, i'm going to set up them to talk to you directly... | 21:34 |
| wbrady | ok | 21:34 |
| *** hgrover has joined #schooltool | 21:36 | |
| wbrady | hgrover: welcome | 21:37 |
| hgrover | this is a cool little program | 21:37 |
| hgrover | but anyways, the situation is that we don't exactly understand connect to the router that has ipcop installed | 21:38 |
| hgrover | and mr elkner says that we should | 21:38 |
| hgrover | but when we did connect that one time, david grehb had to help us out with it | 21:38 |
| wbrady | did he not tell u how to do it? | 21:38 |
| hgrover | he just sat down and changed some gateways and ip adresses, then set us out on our own to explore the router and do what we needed to do | 21:39 |
| hgrover | and that's what we don't understand, is how to do that | 21:39 |
| wbrady | im afraid i dont know how to do it only david does | 21:39 |
| wbrady | unless u ask matt gallagher or someone but you might just have to give up on that | 21:40 |
| hgrover | ok, but it seems as though mr elkner thinks that everyone should know how to do this | 21:40 |
| hgrover | he's saying that this will mostly be used for home routers | 21:40 |
| hgrover | and that the people who are reading this tutorial will need to know how to do that, so we should write about it | 21:40 |
| hgrover | so i guess we'll just skip over that part till i get a chance to talk to somebody who might understand it | 21:41 |
| wbrady | u need to talk to matt gallagher about understanding it | 21:41 |
| wbrady | i dont even know how to do it | 21:41 |
| hgrover | ok, i guess we'll try to get in touch with him | 21:41 |
| wbrady | have u finished writing the first lesson? | 21:41 |
| hgrover | we're almost done, i believe | 21:41 |
| wbrady | talk to jelkner about getting in touch with matt | 21:41 |
| hgrover | we'll likely finish it up this class period | 21:41 |
| wbrady | good | 21:42 |
| wbrady | i finished lesson 2 also, it would be nice for u to test that also | 21:42 |
| wbrady | jelkner: we need to do some major refactoring with the networking lessons | 21:43 |
| jelkner | yes | 21:46 |
| jelkner | that is what I hope you will work on | 21:46 |
| wbrady | there are too many topics that are either not in the right place or spread out over multiple lessons | 21:46 |
| wbrady | and there is no flow of the lessons (like there is no first lesson then second lesson and so on) | 21:46 |
| wbrady | im going to go back and redraw up an outline of how the lessons should go then cut and paste all the necessary pieces from current lessons into that | 21:47 |
| hgrover | someone went through lesson one and added something like "<<<<<<<<<< TREE" | 21:50 |
| hgrover | and that seems to be messing it up | 21:51 |
| wbrady | what? i dont see that | 21:52 |
| Lumiere | that's a conflict | 21:53 |
| hgrover | it's in line 31 on ours | 21:53 |
| Lumiere | from bzr or svn | 21:53 |
| hgrover | but i suppose someone might have done something stupid while we weren't looking | 21:53 |
| Lumiere | it is saying that I found a conflict here | 21:53 |
| hgrover | cause there are people in this class who would probably find "tree" funny | 21:53 |
| Lumiere | if you look in the file | 21:53 |
| Lumiere | and scroll down | 21:53 |
| Lumiere | you'll find a >>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<< | 21:53 |
| Lumiere | and a >>>>>>>>>>>>>>>> r??? | 21:54 |
| Lumiere | or something like that | 21:54 |
| hgrover | it just says "<<<<<<<< TREE" | 21:54 |
| Lumiere | hgrover: keep scrolling down | 21:54 |
| Lumiere | I am sure something like that is in there | 21:54 |
| hgrover | yeah, i see that | 21:54 |
| hgrover | it says ">>>>>>>>> MERGE-SOURCE> | 21:54 |
| Lumiere | yes | 21:54 |
| Lumiere | it means that tree -> merge source -> ? found an edit conflict | 21:55 |
| wbrady | this is in lesson 1? | 21:55 |
| Lumiere | usually meaning someone edited something right on what you or someone else edited | 21:55 |
| hgrover | yes | 21:55 |
| Lumiere | and then 1 committed | 21:55 |
| Lumiere | when you updated it tried and failed to merge his and your changes | 21:55 |
| wbrady | hgrover: did u not pull when u first came in? | 21:55 |
| hgrover | we did pull | 21:55 |
| hgrover | ahhhh, ok | 21:56 |
| hgrover | when we pulled, it said "1 conflicts encountered" | 21:56 |
| hgrover | i guess that's what did it | 21:56 |
| hgrover | and just out of curiosity, who is lumiere? | 21:56 |
| wbrady | hgrover: jason straw | 21:56 |
| hgrover | ah, ok | 21:57 |
| hgrover | but what should we do to fix that error? | 21:57 |
| Lumiere | bzr? | 21:57 |
| hgrover | yeah, we said "bzr pull" | 21:57 |
| hgrover | and it did all the normal stuff, but with one conflict | 21:57 |
| wbrady | u must not have commited and pushed ur latest changes | 21:57 |
| hgrover | we didn't make any changes before the conflict, though | 21:58 |
| hgrover | we had just got here when we pulled | 21:58 |
| Lumiere | then I would remove the file and bzr update | 21:58 |
| hgrover | and there was already one conflict | 21:58 |
| Lumiere | or | 21:58 |
| Lumiere | look for lesson1.orig | 21:58 |
| hgrover | i see "lesson1.xhtml", "leson1.xhtml.BASE", "lesson1.xhtml.OTHER", and lesson1.xhtml.THIS" | 21:59 |
| Lumiere | yea | 21:59 |
| Lumiere | look at those 3 | 21:59 |
| Lumiere | figure out which is right | 22:00 |
| hgrover | is ".BASE" the same as orig? | 22:00 |
| Lumiere | ya | 22:00 |
| Lumiere | coy it over lesson1.xhtml | 22:00 |
| Lumiere | (copy) | 22:00 |
| Lumiere | then bzr resolve lesson1.xhtml | 22:00 |
| hgrover | ack, school is over | 22:01 |
| hgrover | i have my bike today, though, so i'll get mr elkner to help me with this real fast | 22:02 |
| wbrady | jelkner: i dont know where to put binary and hex | 22:07 |
| *** hgrover has quit IRC | 22:10 | |
| *** jelkner has quit IRC | 22:12 | |
| *** wbrady has quit IRC | 22:19 | |
| *** mattva01 has quit IRC | 22:22 | |
| *** eldar has quit IRC | 23:27 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!