| *** tpb has joined #timvideos | 00:00 | |
| *** FeltonChris has joined #timvideos | 01:56 | |
| *** CarlFK has quit IRC | 01:57 | |
| *** CarlFK has joined #timvideos | 01:58 | |
| *** ChanServ sets mode: +v CarlFK | 01:58 | |
| CarlFK | mithro: create wiki page for packing (I am not really sure where is should live, else I would) | 02:29 |
|---|---|---|
| *** tija has joined #timvideos | 06:00 | |
| *** tija has quit IRC | 06:32 | |
| *** mparuszewski_ has joined #timvideos | 06:33 | |
| *** tija has joined #timvideos | 06:51 | |
| *** tija has quit IRC | 07:51 | |
| *** rohitksingh has joined #timvideos | 10:00 | |
| *** rohitksingh has quit IRC | 10:30 | |
| *** rohitksingh has joined #timvideos | 10:31 | |
| mithro | heyo | 10:53 |
| rohitksingh | mithro: Hi! | 10:54 |
| rohitksingh | shall we set up repos now? | 10:54 |
| mithro | sure | 10:54 |
| rohitksingh | ok, what steps do I have to perform to merge the HDMI_Test_v06 to HDMI2USB-vmodvga/examples/hdmi-output-implementation ? First I have to create the examples directory and the sub directory? | 10:58 |
| mithro | rohitksingh: first thing is you need to modify HDMI_Test_v06 to have the output in the correct destination directory | 11:02 |
| mithro | rohitksingh: use "git mv x y" in the HDMI_Test_v06 repo and then commit it | 11:02 |
| rohitksingh | ok! trying it | 11:03 |
| rohitksingh | mithro: what do u mean by output? do you mean "git mv repo-root-dir to_examples_dir" ? | 11:11 |
| mithro | rohitksingh: yeah | 11:12 |
| rohitksingh | ok | 11:13 |
| rohitksingh | trying | 11:13 |
| mithro | http://dangerousprototypes.com/hackercampshenzhen/schedule/ | 11:19 |
| tpb | Title: Schedule | Hacker Camp Shenzhen (at dangerousprototypes.com) | 11:19 |
| rohitksingh | it gives error "fatal: 'c:/Users/Rohit/Documents/GitHub/HDMI2USB-vmodvga/examples/hdmi-output-implementation' is outside repository" it was the destination directory | 11:20 |
| mithro | rohitksingh: no | 11:21 |
| rohitksingh | then? | 11:21 |
| mithro | your moving it to the relative location inside the same directory | 11:22 |
| mithro | IE "mkdir examples/hdmi-output-implementation; git mv * examples/hdmi-output-implementation" | 11:23 |
| rohitksingh | oh okay! trying it now | 11:23 |
| rohitksingh | it should every directory except 'examples' dir right? because it says "fatal: can not move directory into itself, source=examples, destination=examples/hdmi-output-implementation/examples"....so can't use '*' | 11:26 |
| mithro | yeah | 11:27 |
| rohitksingh | ok let me try | 11:27 |
| rohitksingh | okay moved everything except .git dir and .gitignore & .gitattributes files. Shall I move them too? | 11:32 |
| rohitksingh | currently this is root directory ".git/ .gitattributes .gitignore examples/" | 11:34 |
| rohitksingh | and this is contents of hdmi-output-implementation "LICENSE README.md hdl/ i2c/ ipcore_dir/ ise/ ucf/" | 11:35 |
| mithro | okay | 11:35 |
| mithro | rohitksingh: all committed? | 11:35 |
| rohitksingh | Yes all commited till now. I wanted to ask shall I move git dir and .gitignore & .gitattributes files too? | 11:37 |
| mithro | rohitksingh: you can keep them | 11:37 |
| rohitksingh | okay! | 11:37 |
| rohitksingh | next step? | 11:37 |
| mithro | then go into the hdmi2usb-vmodvga | 11:37 |
| rohitksingh | done | 11:38 |
| mithro | and add a git remote pointing to the other repo's .git directory | 11:38 |
| rohitksingh | okay..let me try | 11:38 |
| mithro | git remote add other 'c:/Users/Rohit/Documents/GitHub/HDMI_Test_v06/.git" | 11:38 |
| mithro | rohitksingh: something like that | 11:39 |
| rohitksingh | okay | 11:39 |
| rohitksingh | BTW the hdmi2usb-vmodvga repo's default is 'gsoc'... does it matter? | 11:41 |
| rohitksingh | deafult branch | 11:42 |
| mithro | not really | 11:42 |
| rohitksingh | done | 11:42 |
| mithro | git fetch other | 11:43 |
| rohitksingh | done... this is the output http://pastebin.com/QsB7i8U3 | 11:46 |
| tpb | Title: $ git fetch other warning: no common commits remote: Counting objects: 388, done - Pastebin.com (at pastebin.com) | 11:46 |
| mithro | rohitksingh: LGTM | 11:46 |
| mithro | now you are going to do a "git merge other/master" | 11:46 |
| mithro | rohitksingh: there are likely to be conflicts | 11:46 |
| rohitksingh | mithro: okay. let me try | 11:47 |
| rohitksingh | yeah. says conflict in .gitignore http://pastebin.com/igqPQkUj | 11:48 |
| tpb | Title: $ git merge other/master Auto-merging .gitignore CONFLICT (add/add): Merge confl - Pastebin.com (at pastebin.com) | 11:48 |
| mithro | so manually merge the conflicting files | 11:48 |
| rohitksingh | okay, after that again "git merge other/master"? | 11:49 |
| mithro | rohitksingh: no | 11:49 |
| mithro | git commit | 11:49 |
| rohitksingh | done | 11:52 |
| rohitksingh | then push? | 11:52 |
| mithro | rohitksingh: same process for the other repo | 11:53 |
| rohitksingh | mithro: thanks so much! learned something great today! will do with same with other repo too! | 11:53 |
| rohitksingh | mithro: done with other repo too | 12:11 |
| mithro | rohitksingh: push it and i'll take a look | 12:13 |
| rohitksingh | done | 12:13 |
| mithro | rohitksingh: you should be a little more careful about committing temporary files | 12:21 |
| mithro | rohitksingh: when you did the directory restructuring you also modified files | 12:22 |
| mithro | rohitksingh: you should have committed the changes first and then done the restructure | 12:22 |
| mithro | rohitksingh: have you used gitk before? | 12:23 |
| rohitksingh | mithro: okay. will keep in mind! i will have to clean temporary files | 12:24 |
| rohitksingh | mithro: gitk? no never heard of it before :/ | 12:24 |
| mithro | it's a tool which lets you see the commit history in a nice visual manner | 12:25 |
| rohitksingh | mithro: wow! It awesome! (gitk) | 12:25 |
| mithro | rohitksingh: yeah, it's really helpful to see history | 12:31 |
| rohitksingh | mithro: it just became my one of the favorite tools! | 12:32 |
| rohitksingh | Is anyone going to Hacker Camp Shenzen? (link posted above) | 12:33 |
| mithro | rohitksingh: I'd love too | 12:33 |
| mithro | rohitksingh: but probably won't | 12:33 |
| rohitksingh | mithro: I guess all seats would have been full by now! Its really popular | 12:34 |
| rohitksingh | Nope...few seats are still available. | 12:35 |
| mithro | rohitksingh: I'd highly recommend it - it sounds super fun | 12:39 |
| rohitksingh | mithro: Yeah. I'm planning for the next one. This one's schedule clashes with my mid-sem exams. Would really miss it! | 12:42 |
| mithro | rohitksingh: that's the november one right? | 12:44 |
| rohitksingh | mithro: yeah! 17-19th Nov | 12:48 |
| *** FeltonChris has quit IRC | 13:10 | |
| *** Niharika has joined #timvideos | 13:16 | |
| * Niharika waves | 13:18 | |
| CarlFK | mithro: wiki page of stuff for deb guys? that may be looking for someting to do today | 13:33 |
| CarlFK | I am in an out, need to pack, eat and fly to Portland | 13:34 |
| mithro | CarlFK: well, it's 11:34pm tonight :P | 13:34 |
| CarlFK | start a page somehwere, I can add to it | 13:34 |
| CarlFK | but I wasn't sure where such a thing should live | 13:34 |
| mithro | mparuszewski_: ping? | 13:35 |
| mparuszewski_ | mithro: pong | 13:35 |
| mithro | mparuszewski_: so where did that documentation for the website deployment stuff end up? | 13:35 |
| mithro | mparuszewski_: and where did your final report end up? | 13:36 |
| mparuszewski_ | Here is final report: https://docs.google.com/document/d/1KL_aSBfdnwuqZ4zhFrukZplk3v3DMut9_GvX-cUPZMw/edit?usp=docslist_api | 13:37 |
| tpb | Title: GSoC Final Report - Google Docs (at docs.google.com) | 13:37 |
| mparuszewski_ | And readme file for getting started with instructions is here https://github.com/timvideos/getting-started/blob/master/README.md | 13:41 |
| tpb | Title: getting-started/README.md at master · timvideos/getting-started · GitHub (at github.com) | 13:41 |
| mparuszewski_ | How to deploy is here on wiki https://github.com/timvideos/getting-started/wiki/How-to-fork-and-run-own-getting-started%3F | 13:42 |
| tpb | Title: How to fork and run own getting started? · timvideos/getting-started Wiki · GitHub (at github.com) | 13:42 |
| mparuszewski_ | And here https://github.com/timvideos/getting-started/wiki/From-change-to-generated-website---how-does-it-work%3F | 13:42 |
| tpb | Title: From change to generated website how does it work? · timvideos/getting-started Wiki · GitHub (at github.com) | 13:42 |
| mithro | CarlFK: https://github.com/timvideos/streaming-system/wiki/Debian-Packaging | 13:45 |
| tpb | Title: Debian Packaging · timvideos/streaming-system Wiki · GitHub (at github.com) | 13:45 |
| mithro | mparuszewski_: so there seems to be some confusion here | 13:45 |
| mparuszewski_ | Why, should I clarify something? :) | 13:47 |
| mithro | mparuszewski_: the idea was to divorce the getting-started report from the website | 13:48 |
| mparuszewski_ | I created documents on getting started before I was writing report, about 2-3 weeks ago to make it easier for contributors and developers to modify content and deploy website | 13:51 |
| CarlFK | mithro: thanks | 13:52 |
| mparuszewski_ | I can also add them to my report, I tried to not repeat myself, but if that is an issue I will do that. :) | 13:52 |
| mithro | mparuszewski_: btw - it's a bad idea to resolve someone elses comments | 14:17 |
| mparuszewski_ | I understand, I haven't used Google Docs with comments before. Thank you for your hint. | 14:19 |
| mithro | rohitksingh: can you go back and redo the restructure / merge without the tmp files being added? | 14:22 |
| rohitksingh | mithro: i'll be heading out for neighbour's home in few minutes. I'll do it after i return | 14:23 |
| mithro | rohitksingh: no worries | 14:24 |
| *** rohitksingh has left #timvideos | 14:27 | |
| *** rohitksingh has quit IRC | 14:27 | |
| *** CarlFK has quit IRC | 14:41 | |
| *** tija has joined #timvideos | 14:43 | |
| *** tija has quit IRC | 14:51 | |
| *** CarlFK has joined #timvideos | 16:08 | |
| *** ChanServ sets mode: +v CarlFK | 16:08 | |
| mithro | CARAM: if you don't fill out your end of GSoC survey you automatically fail no matter what the mentor sets | 16:10 |
| *** CarlFK has quit IRC | 16:28 | |
| *** CarlFK has joined #timvideos | 16:30 | |
| *** ChanServ sets mode: +v CarlFK | 16:30 | |
| *** CarlFK has quit IRC | 16:31 | |
| *** rohitksingh has joined #timvideos | 17:23 | |
| *** Niharika_ has joined #timvideos | 17:32 | |
| *** Niharika has quit IRC | 17:35 | |
| Niharika_ | mithro: Around? | 17:53 |
| mithro | Niharika_: hopefully not for much longer | 17:54 |
| mithro | it being 3:54am | 17:54 |
| Niharika_ | As my understanding goes, from my communications with skay, you can set it up such that bugtracker.timvideos.us redirects to bugtracker.codersquid.com. | 17:54 |
| Niharika_ | I thought so. | 17:54 |
| Niharika_ | We could talk tomorrow (later today for you). No issues. | 17:55 |
| mithro | Niharika_: dump it in the pull request then I can do it at my lesiure :P | 17:55 |
| Niharika_ | Alright, and I'll update the commit message. Thanks! | 17:56 |
| mithro | see ya! | 18:00 |
| mithro | rohitksingh: you should also close out any issues on your repo at https://github.com/rohit91/HDMI2USB-vmodvga/issues | 18:01 |
| tpb | Title: Issues · rohit91/HDMI2USB-vmodvga · GitHub (at github.com) | 18:01 |
| mithro | rohitksingh: then disable github issues | 18:01 |
| rohitksingh | okay! | 18:04 |
| rohitksingh | mithro: btw by going back you meant reverting the commits right? | 18:05 |
| rohitksingh | mithro: okay, i suppose its time for you to sleep. I'll see git documentation on that | 18:07 |
| *** CarlFK has joined #timvideos | 18:12 | |
| *** ChanServ sets mode: +v CarlFK | 18:12 | |
| *** Niharika_ has quit IRC | 18:26 | |
| *** CarlFK has quit IRC | 18:43 | |
| *** mparuszewski_ has quit IRC | 19:52 | |
| *** CarlFK has joined #timvideos | 20:03 | |
| *** ChanServ sets mode: +v CarlFK | 20:03 | |
| *** rohitksingh has quit IRC | 20:17 | |
| CarlFK | aps: ping - can you bring up 3 test streams on the EC2 boxes in the next 4-6 hours? | 20:19 |
| aps | CarlFK: It's around 2am here. Any chance to do it before 2 hours or after 7 hours? | 20:20 |
| CarlFK | I am arriving at debconf in about 2 hours, and someone just told me "I have the icecast server ready!" so being able to show something else working too will help the "why different?!!!" rage I expect. | 20:20 |
| CarlFK | aps: cool. don't worry about it now then. if we can do it in 7 or 8 that's fine too | 20:21 |
| CarlFK | today is meet and greet and setup some networking. tomorrow is setup the rooms, first talk is the day after that | 20:23 |
| aps | ah, then we have time I guess. | 20:23 |
| CarlFK | sort of ;/ | 20:27 |
| CarlFK | people are grumpy that I am "taking over and doing it my way" | 20:27 |
| CarlFK | can you feed the bouncing ball feed as a test stream? | 20:30 |
| CarlFK | oh, if you can something now that thats good too. 4-6 hours was to give you some time :p | 20:32 |
| aps | okay, let me see | 20:32 |
| aps | CarlFK: encoder domains? | 20:33 |
| CarlFK | ? | 20:34 |
| aps | umm, I mean EC2 box ssh url | 20:34 |
| aps | like cartoon1.encoder.timvideos.us | 20:34 |
| CarlFK | I still don't understand | 20:35 |
| aps | how do I ssh into EC2 boxes? | 20:35 |
| CarlFK | thats what I was hoping you knew | 20:36 |
| aps | mithro set the EC2 encoder and gave me configration which was cartoon1.encoder.timvideos.us cartoon2.encoder.timvideos.us barbie.encoder.timvideos.us hays.encoder.timvideos.us for PyOhio | 20:36 |
| CarlFK | you need to turn them on from the aws?.amazon.com | 20:37 |
| aps | yes, I guess | 20:37 |
| CarlFK | I doubt that has changed | 20:37 |
| aps | CarlFK: and btw he had added my pub key that time, not sure if it's still there. | 20:38 |
| CarlFK | https://github.com/timvideos/streaming-system none of the "at venue" will be ready for about 15 hours from now | 20:38 |
| tpb | Title: timvideos/streaming-system · GitHub (at github.com) | 20:38 |
| CarlFK | likely still there | 20:38 |
| CarlFK | did you ever use the management console to bring up/down the boxes? | 20:39 |
| aps | no | 20:39 |
| CarlFK | oh oh... | 20:39 |
| aps | you have any idea about ssh IP? | 20:39 |
| CarlFK | lets see if I can... | 20:39 |
| CarlFK | https://console.aws.amazon.com/console/home | 20:39 |
| CarlFK | oh cwap. those are my boxes, not Tim's | 20:41 |
| CarlFK | oh extra cwap "This account is currently blocked and not recognized as a valid account. Please contact [email protected] if you have questions." | 20:42 |
| CarlFK | I think it is because I let my someting key end up on github :p | 20:42 |
| CarlFK | 6am tim time, I'll get with him and get you 3 boxes with pub keys and all that | 20:43 |
| CarlFK | how many hours until you are awake and somewhat alert ? | 20:44 |
| aps | 1, maybe 2 | 20:44 |
| CarlFK | oh, I thought you were going to bed soon? | 20:44 |
| aps | tim time is 6:45 am right now | 20:44 |
| aps | and he went to bed after 4 | 20:45 |
| CarlFK | aren't you going to sleep soon? | 20:46 |
| aps | yeah, I'll sleep now if can't set it up right now | 20:46 |
| aps | CarlFK: oh sorry, I though you were asking in how much time I will sleep. I'll be wide awake in 6 hours | 20:46 |
| CarlFK | yeah, sleeep now, don't worry about getting up early | 20:47 |
| CarlFK | need to wait for tim to get up, get on and get the boxes up - I don't expect that for 6-8 hours from now. | 20:47 |
| CarlFK | it is 1:50p in Portland (where DebConf is) so if we get something up later tonight (10p or so) thats good enough | 20:50 |
| CarlFK | I expect to get booted off the internet 'soon' | 20:51 |
| CarlFK | as in now | 20:51 |
| CarlFK | get some sleep, take your time waking up, hopefully Tim and I will have ec2 boxes ready for you | 20:52 |
| aps | okay, cya | 20:53 |
| *** CarlFK has quit IRC | 21:04 | |
| *** CarlFK has joined #timvideos | 21:40 | |
| *** ChanServ sets mode: +v CarlFK | 21:40 | |
| *** CarlFK has quit IRC | 21:58 | |
| *** CarlFK has joined #timvideos | 22:00 | |
| *** ChanServ sets mode: +v CarlFK | 22:00 | |
| *** CarlFK has quit IRC | 22:01 | |
| *** mparuszewski_ has joined #timvideos | 22:46 | |
Generated by irclog2html.py 2.12.1 by Marius Gedminas - find it at mg.pov.lt!