| doctormo | paultag: hey there | 04:20 |
|---|---|---|
| * BiosElement pokes doctormo | 04:39 | |
| doctormo | BiosElement: Hey! | 04:39 |
| doctormo | BiosElement: You want to go now/? | 04:40 |
| BiosElement | doctormo: Just about any time is fine with me. It's up to you and pleia2 I think. | 04:40 |
| pleia2 | hm? | 04:41 |
| BiosElement | Already been flipping through the bzr docs. Looks like a combo of SVN/Git to me >.> | 04:41 |
| doctormo | pleia2: going to do a quick run through of bzr | 04:41 |
| pleia2 | ok, I need to get to bed, but I'll read the buffer in the morning :) | 04:42 |
| BiosElement | pleia2: Would tomorrow be better for you? Assuming that's fine with you doctormo. | 04:42 |
| doctormo | pleia2: sounds good | 04:42 |
| doctormo | BiosElement: Sure, what time is good for all? | 04:42 |
| pleia2 | I'll be around all day tomorrow, but you really don't need to wait for me | 04:43 |
| BiosElement | It's up to pleia2. Maybe 2 hours earlier from now? | 04:43 |
| pleia2 | that's fine | 04:43 |
| doctormo | pleia2: Sure we do! Getting students together for the class is important | 04:43 |
| pleia2 | fair enough :) | 04:44 |
| * pleia2 zzz | 04:44 | |
| BiosElement | Night then pleia2, See you tomorrow. | 04:44 |
| doctormo | pleia2, BiosElement: ok we'll go tomorrow at between 2pm and 5pm EST, give or take | 04:45 |
| doctormo | It should take about 30 mins tops | 04:46 |
| BiosElement | Sounds good. And yeah, I don't think it'll take long. | 04:46 |
| doctormo | Thanks BiosElement, your most excelent to email :-D | 04:51 |
| BiosElement | doctormo, You're welcome. ^_^ I'll be around at 2PM EST tomorrow and probably idle through the night. Lemme know if you need anything else. | 04:52 |
| === tim__sharitt is now known as tim_sharitt | ||
| pleia2 | ok everyone: https://wiki.ubuntu.com/Learning/TeamReports | 18:08 |
| pleia2 | and our meeting is in about 2.5 hours :) | 18:19 |
| BiosElement | pleia2, I'll be back at around 2:30-3:00. Sorry for being late. I'll let DoctorMo know. | 18:37 |
| BiosElement | That's EST. | 18:37 |
| pleia2 | no problem | 18:39 |
| BiosElement | doctormo, pleia2 I'm back. | 19:56 |
| pleia2 | wb | 19:56 |
| BiosElement | pleia2, Thanks. | 19:56 |
| doctormo | hey | 20:26 |
| doctormo | I figured i had until 3:30 | 20:27 |
| BiosElement | Ahh, you were close enough doctormo. | 20:27 |
| doctormo | well, i'll be 13 mins > shower, I want you both to open up a terminal window, make sure you have a projects or documents directory and get into it and put any work you've done somewhere where we can move them from. | 20:30 |
| BiosElement | Aight | 20:30 |
| doctormo | pleia2: ping | 20:39 |
| doctormo | BiosElement: Wasn't pleia2 just here? | 20:45 |
| BiosElement | doctormo, Yep. Just a few ago. | 20:45 |
| doctormo | We'll wait | 20:46 |
| BiosElement | Fine with me. | 20:46 |
| pleia2 | hey | 20:55 |
| pleia2 | we have a team meeting in -meeting in 5 minutes | 20:55 |
| doctormo | pleia2: Well that's damn inconvienient ;-) | 20:57 |
| pleia2 | :P | 20:57 |
| doctormo | It's in #ubuntu-meeting | 20:58 |
| doctormo | and then afterwards we'll do this checkout walk through | 20:58 |
| pleia2 | Bodhi said he probably can't make it, and cprofitt has some family stuff | 20:58 |
| doctormo | pleia2: Looks like your in charge | 20:58 |
| pleia2 | I haven't seen Vantrax :( | 20:58 |
| pleia2 | yeah, won't be a long meeting | 20:58 |
| * BiosElement pops over >.> | 21:44 | |
| pleia2 | :) | 21:44 |
| Grantbow | Gidget_Kitchen: DCC won't work for me, try /msg Grantbow foo | 21:46 |
| doctormo | ok editing done | 21:49 |
| pleia2 | thanks doctormo :) | 21:49 |
| doctormo | Everyone ready? | 21:51 |
| BiosElement | Well I am. | 21:51 |
| doctormo | Get open a command line terminal windows and cd into your projects directory | 21:51 |
| BiosElement | Got it. Lets make sure pleia2 is ready though. | 21:51 |
| pleia2 | maybe we should start from the top, for those who have no idea where our bzr branch even is? :) | 21:51 |
| Grantbow | o/ | 21:52 |
| doctormo | ok | 21:53 |
| doctormo | What we have here is a workflow for the creation and publication of creative materials | 21:53 |
| doctormo | For the creation and peer review process it seems like the best tool for the job is bzr on launchpad | 21:53 |
| doctormo | bzr is a peer based content versioning system, unlike cvs and svn which are master/client based systems. | 21:54 |
| doctormo | This means that each person's branch is just as equal as anyone elses. | 21:54 |
| === tim__sharitt is now known as tim_sharitt | ||
| Grantbow | I know bzr, just need the repo address | 21:55 |
| Grantbow | found it | 21:55 |
| doctormo | You should make sure your computer has bazar installed, you can do this from the command line by typing in "sudo apt-get install bzr" | 21:55 |
| Grantbow | oops, no branches at code.launchpad.net/~ubuntu-learning | 21:55 |
| doctormo | Grantbow: These instructions are from the top and for the record. | 21:56 |
| BiosElement | Grant, relax. doctormo will get to it. | 21:56 |
| doctormo | Once bzr is installed, you should create a directory for your projects and inside that directory there should be a directory for the ubuntu-learning work. | 21:56 |
| doctormo | (I assume people know how to use mkdir) | 21:57 |
| doctormo | Once inside your project directory you can use a bzr command to create a fresh branch from the trunk: | 21:57 |
| doctormo | `bzr branch ubuntu-learning-materials` | 21:58 |
| doctormo | er sorry | 21:58 |
| doctormo | `bzr branch lp:ubuntu-learning-materials` | 21:58 |
| doctormo | once that's complete, you should have a new directory and inside that should be all the materials. | 21:59 |
| doctormo | those of you who have written parts, take note of the systems-admin directory, which contains all my current work's sources (but not the pdfs or the compiled versions) | 22:00 |
| BiosElement | Aye, I'm poking around it. ^_^ I like the organization system you have. | 22:01 |
| doctormo | BiosElement: Organisational systems are my forte | 22:01 |
| BiosElement | doctormo: That's a very good thing. ^_^ | 22:02 |
| doctormo | So BiosElement and pleia2 should now create their directories. desktop and teaching as required. | 22:02 |
| pleia2 | ok | 22:02 |
| BiosElement | Any particular name you want for the folder mo? I really don't care. | 22:02 |
| doctormo | BiosElement: 'teaching' | 22:02 |
| BiosElement | Aight | 22:02 |
| Grantbow | doctormo: thanks, got a copy | 22:02 |
| doctormo | Inside of the topic sections directory, there is a number of folders, each one contains a class and each class contains all the odf, svg files for that class. | 22:03 |
| doctormo | Each course and class contains a NOTES file where ideas and thigns missing should be kept | 22:03 |
| BiosElement | doctormo: One thought. Perhaps contact information for the current author should be in the notes or "CONTACT" file? | 22:04 |
| doctormo | BiosElement: Good idea, do that | 22:04 |
| BiosElement | doctormo: Ok then. | 22:04 |
| doctormo | I'd like it if those with files could now create their class directories. "01 - Desktop Familarity" and "01 - Class Writing" respectivly. | 22:05 |
| pleia2 | ok | 22:05 |
| BiosElement | Aight | 22:05 |
| doctormo | you might have to use double quotes with mkdir | 22:05 |
| BiosElement | Or backspaces should work. >.> I used those for almost a year before learning double quotes... :S | 22:05 |
| pleia2 | and maybe lowercase, to keep with your convention :) | 22:06 |
| doctormo | Once you have your new directories, move your odf and svg files into it. You may want to make a seperate parts directory for any images which are imported into the odfs | 22:06 |
| pleia2 | BiosElement: backslashes? | 22:06 |
| BiosElement | pleia2: Yeah, my bad. >.> I always mix the two up. | 22:06 |
| Grantbow | underscores ftw - spaces are evil | 22:06 |
| doctormo | Grantbow: Mind the gap | 22:06 |
| BiosElement | doctormo: I'm quoting that. >.> | 22:07 |
| pleia2 | ok, the only .odt I have so far is the one BiosElement wrote | 22:07 |
| pleia2 | my notes thus far are separate | 22:07 |
| doctormo | OK | 22:07 |
| BiosElement | I've currently only got the one .odt. I'm going to be working on a flowchart eventually here. | 22:08 |
| doctormo | so your notes might go into the NOTES file for that class, i.e. ubuntu-learning-materials/desktop/01 - desktop familarity/NOTES | 22:08 |
| BiosElement | doctormo: Contact info inside the NOTES file right? | 22:08 |
| * pleia2 nods | 22:08 | |
| doctormo | BiosElement: Seperate file please, I'll commit one and you guys can follow the structure | 22:08 |
| BiosElement | Ok, that'll work. | 22:08 |
| doctormo | BiosElement, pleia2: once you have your files and folders layed out, you can use the command | 22:11 |
| doctormo | bzr add [filenames] | 22:11 |
| doctormo | In this case just a `bzr add desktop` will do the trick as it will add all sub directories too. | 22:12 |
| doctormo | But in future you'll have to be sepcific | 22:12 |
| pleia2 | so I'm a bit of a bzr n00b, I checked this out anonymously I think | 22:12 |
| BiosElement | pleia2: Follow the help instructions. I already finished that bit. Should work fine. | 22:12 |
| pleia2 | BiosElement: where? | 22:13 |
| BiosElement | Hang 1 | 22:13 |
| BiosElement | "bzr launchpad-login [NAME]" | 22:13 |
| pleia2 | neat | 22:13 |
| BiosElement | You probably need to upload SSH keys to launchpad though, I'm not sure. | 22:13 |
| pleia2 | yeah, my keys are up there | 22:14 |
| doctormo | Ah that part I missed, I have a config that does that for me | 22:14 |
| doctormo | And the SSH part, we should have those as prerequisits. | 22:14 |
| * pleia2 nods | 22:14 | |
| doctormo | BiosElement: Can you make a note of these things for the second class? (commiting and peer review?) | 22:14 |
| BiosElement | Will do. | 22:14 |
| doctormo | Fantastic | 22:15 |
| doctormo | (this is why we write materials, as guides for teaching lol) | 22:15 |
| BiosElement | bzr: ERROR: Not a branch: "/home/william/Documents/Ubuntu Learning/teaching/". | 22:15 |
| BiosElement | *cough* I goofed something. >.> | 22:16 |
| BiosElement | Helps if i cd into the directory I suspect | 22:16 |
| pleia2 | oh yes, what is the next step here? | 22:17 |
| doctormo | OK so cd into the parent directory before you add | 22:18 |
| BiosElement | I got it, just had to cd in. | 22:18 |
| BiosElement | Yep. I shoulda known. >.> | 22:18 |
| doctormo | Then you have to do `bzr commit` | 22:18 |
| doctormo | this command adds the files and any modifications to your local branch | 22:18 |
| pleia2 | Committed revision 11. | 22:18 |
| doctormo | You'll be asked for a commit message, please make sure it says what you've done. | 22:18 |
| doctormo | Now once you've got your commited branch, you want to `bzr push lp:~username/ubuntu-learning-materials/mybranchname` | 22:19 |
| doctormo | You can call your branch something relivent or just name it after yourself | 22:19 |
| BiosElement | What's the save commit notes command? >.> I don't use console editing much. (Though I want too.) | 22:19 |
| doctormo | I thought it was -e "blah" | 22:20 |
| doctormo | But I don't use that option much | 22:21 |
| doctormo | Let me know when your ready for the next bit | 22:21 |
| BiosElement | IRC Handles or Real Names? We have a standard for that yet? >.> | 22:22 |
| doctormo | BiosElement: Both if you can | 22:23 |
| doctormo | doesn't matter for the branches though | 22:23 |
| doctormo | Only for notes and contact | 22:23 |
| BiosElement | I meant for the branches. Ahh, ok. RL name it is then. | 22:23 |
| pleia2 | I just put my lp name | 22:24 |
| doctormo | Normally once you've got your stuff live, you'll want to pull down other people's changes. The command you use depends on if your branch is different from theirs. If yours hasn't changed since their's diverged, then use 'bzr pull lp:~theiruser/ubuntu-learning-materials/theirbranchname' | 22:24 |
| pleia2 | ok, so how do I get doctormo's stuff? | 22:24 |
| doctormo | If your pulling something down and it's from an older diverence, then use `bzr merge lp:~theiruser/ubuntu-learning-materials/theirbranchname` | 22:25 |
| doctormo | OK so we're going to merge in the change I just made, just to show you | 22:25 |
| doctormo | I've updated the branch lp:ubuntu-learning-materials to rev 11 and so have both of you | 22:26 |
| doctormo | So technically we have a conflict | 22:26 |
| doctormo | But it's easy and cheap to merge and branch with bzr | 22:26 |
| doctormo | Just use `bzr merge lp:ubuntu-learning-materials` and your branch should be up to date | 22:27 |
| doctormo | Then use bzr commit and bzr push as above to move those changes into your live branches | 22:27 |
| pleia2 | +N CONTACTS | 22:27 |
| pleia2 | +N systems-admin/CONTACT | 22:27 |
| pleia2 | All changes applied successfully. | 22:27 |
| pleia2 | :) | 22:27 |
| doctormo | Great | 22:28 |
| doctormo | now add in your own CONTACT file as shown with my systems-admin one into your own directory and commit and push everything | 22:28 |
| doctormo | BiosElement: Are you keeping up or would you like me to give you some time? | 22:28 |
| BiosElement | Almost got it, Just finished commiting it. vim was giving me a headache so i found the commandline version. | 22:29 |
| doctormo | pleia2: OK have you visited https://code.launchpad.net/~lyz/ubuntu-learning-materials/lyz ? | 22:30 |
| pleia2 | neat | 22:30 |
| doctormo | On your branch page on launchpad, you'll notice a link that says "Propose for merging into another branch" | 22:31 |
| doctormo | Use this link once you've completed a class, that will allow us to know when your ready for peer review and we can go through the changes and aprove it. | 22:31 |
| pleia2 | cool | 22:32 |
| doctormo | Make sure to note what's been done and such | 22:32 |
| doctormo | Once it's gone into the main repository (I do a bzr merge and commit) then we can compile and publish it on moodle. | 22:33 |
| Grantbow | nice | 22:33 |
| doctormo | OK that concludes our quick introduction to bzr and the loose workflow we have, | 22:34 |
| pleia2 | thanks doctormo :) | 22:34 |
| doctormo | I have to go now, but I will be back to help BiosElement complete this first class and make a stab at the second. | 22:34 |
| BiosElement | Aight. | 22:34 |
| doctormo | now that we have bzr set up for him, we can propperly collaberate over not-google-docs :-D | 22:34 |
| BiosElement | haha, That'd be nice :P | 22:35 |
| pleia2 | hehe | 22:35 |
| doctormo | ok guys, you might want to practice amongst yourselves. | 22:35 |
| * pleia2 nods | 22:35 | |
| BiosElement | See ya later doctormo. | 22:36 |
| BiosElement | Miracles happen >.> https://code.launchpad.net/~williamchambers/ubuntu-learning-materials/williamchambers | 22:39 |
| BiosElement | Finally got it. haha | 22:39 |
| pleia2 | :D | 22:39 |
| BiosElement | Well one good thing happened. I found 15 new ways to goof it to tell people 'not' to do. ^_^ | 22:40 |
| BiosElement | "See what I did there? Just do the exact opposite of what I did and you'll do great." | 22:40 |
| pleia2 | hehe | 22:41 |
| Grantbow | lol | 22:41 |
| BiosElement | pleia2: Are you still around? | 22:51 |
| pleia2 | yep | 22:52 |
| BiosElement | pleia2: The Bazaar docs are surprisingly useful if you want to flip through them. http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html | 22:53 |
| pleia2 | BiosElement: thanks :) I have that link and started going through it, was just tricky without being immediatley applicable (it is now) | 22:53 |
| pleia2 | if I could type that'd be neat too | 22:53 |
| BiosElement | pleia2: I know what you mean. I was reading it last night. Pretty easy to read compared to most docs. And yes, typing is good :P | 22:54 |
| pleia2 | hehe | 22:54 |
| Gidget_Kitchen | thank you Grant - Criticism is always appreciated - I want to be able to present my message as clearly as possible | 23:02 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!