fluid-work IRC Logs-2011-11-17
- Fluid IRC Log Bot
[09:17:55 CST(-0600)] <jhung> justin_o, is 9am okay to meet with Siro on Tuesday?
[09:18:11 CST(-0600)] <Justin_o> jhung: sure, that should be fine
[09:18:15 CST(-0600)] <jhung> k
[09:18:29 CST(-0600)] <Justin_o> jhung: have you tracked down the transformers yet?
[09:48:28 CST(-0600)] <jhung> justin_o: I have not. I saw some at Active Surplus, but they were larger 500W models. I may have to dig a little deeper there.
[09:48:48 CST(-0600)] <Justin_o> jhung: okay
[09:48:56 CST(-0600)] <jhung> justin_o: I checked Canadian Tire, they didn't have anything.
[09:48:58 CST(-0600)] <colinclark> Hey jvass, when you get a chance can you print out and sign the Fluid Contributor License Agreement? All of our contributors sign one of these, and it just ensures that you're willing to share all your work under our open source licenses. http://wiki.fluidproject.org/download/attachments/1707690/FluidCLA_V3.0.pdf?version=1&modificationDate=1289342277000
[09:49:45 CST(-0600)] <Justin_o> colinclark: I believe jvass already did that.. i left a copy of it in iris' mailbox a week ago i think
[09:49:53 CST(-0600)] <colinclark> Justin_o: Okay, great
[09:49:54 CST(-0600)] <colinclark> thanks
[09:50:58 CST(-0600)] <jhung> justin_o: since you're at the office, can you start downloading the software we'll need to take to Nigeria? ubuntu 10.04 32bit, virtualbox, TightVNC for Windows...
[09:51:39 CST(-0600)] <Justin_o> jhung: sure, where should i be putting all those?
[09:51:53 CST(-0600)] <jhung> On your own machine for now is fine.
[09:51:54 CST(-0600)] <Justin_o> i can make an install disk for ubuntu, but where would you like the rest
[09:51:56 CST(-0600)] <Justin_o> okay
[09:52:16 CST(-0600)] <jhung> Yeah, a disk for 10.04 would be handy.
[10:11:00 CST(-0600)] <michelled> Justin_o: you might want to take a look at this - it will be relevant to our next jQuery upgrade I think
[10:11:05 CST(-0600)] <michelled> http://blog.jquery.com/2011/11/08/building-a-slimmer-jquery/
[10:11:20 CST(-0600)] <Justin_o> michelled: sure, will do
[10:11:50 CST(-0600)] <michelled> yura: jQuery is planning to deprecate live
[10:14:36 CST(-0600)] <yura> but not delegate right ?
[10:14:43 CST(-0600)] <Justin_o> michelled: i'm hopeful that most of those deprecated methods will not affect us too much
[10:15:03 CST(-0600)] <michelled> it doesn't look like they will
[10:15:07 CST(-0600)] <Justin_o> michelled: Bosmon might be interested in this too.. i wonder if we should recommend anything for them to drop as well
[10:16:16 CST(-0600)] <michelled> yura: delegate is fine - I guess you've already switched to using delegate?
[10:17:16 CST(-0600)] <yura> yes
[10:18:12 CST(-0600)] <Justin_o> jhung: i've got ubuntu 10.04, virtual box, and tightvnc all downloaded.. i need to track down some disks to burn ubuntu still though.. anything else we need to download?
[10:18:27 CST(-0600)] <jhung> let me check justin_o
[10:19:17 CST(-0600)] <jhung> nothing I can think of at the moment.
[10:19:48 CST(-0600)] <Justin_o> jhung: okay, thanks
[10:19:53 CST(-0600)] <michelled> jvass: you might find this article interesting: http://mobiforge.com/starting/story/mobile-web-content-adaptation-techniques
[10:20:56 CST(-0600)] <jhung> justin_o: I'm going to look into merging genpdf w master today.
[10:21:25 CST(-0600)] <jhung> justin_o: I assume this should go into the genpdf sub repo?
[10:21:58 CST(-0600)] <Justin_o> jhung: yes, that's correct, make sure you update the reference from the default repo to point at the correct changeset though
[10:22:28 CST(-0600)] <jhung> okay. I'll get it merging first justijn_o
[10:22:33 CST(-0600)] <jhung> *justin_o
[10:23:34 CST(-0600)] <Justin_o> jhung: thanks.. i think if you do the merge in the sub repo, but do the commit from the default repo, everything should be updated correctly
[10:24:34 CST(-0600)] <jhung> okay.
[12:33:42 CST(-0600)] <jhung> justin_o, how many heads does your genpdf sub repo show you when you do "hg heads"?
[12:33:55 CST(-0600)] <Justin_o> jhung: one second i'll take a look
[12:34:39 CST(-0600)] <Justin_o> jhung: 3
[12:35:01 CST(-0600)] <Justin_o> 1 is tip, the other 2 are from named branches i think
[12:35:40 CST(-0600)] <jhung> justin_o okay. When I merge in Hasan's code, it creates 4 heads. Hasan's branch became tip.
[12:35:57 CST(-0600)] <Justin_o> jhung: did you merge or pull?
[12:36:04 CST(-0600)] <jhung> merge
[12:36:13 CST(-0600)] <Justin_o> meaning.. you did hg pull hasans repo
[12:36:18 CST(-0600)] <Justin_o> ?
[12:36:29 CST(-0600)] <Justin_o> jhung: what was the command you ran?
[12:36:58 CST(-0600)] <jhung> yes. I did hg pull to pull in hasan's work. then did hg merge to merge his work with the sub repo.
[12:37:41 CST(-0600)] <Justin_o> hmm
[12:37:51 CST(-0600)] <Justin_o> let me give it a try here and see if i can follow along,
[12:38:02 CST(-0600)] <Justin_o> can you send me the url of hasan's repo
[12:38:06 CST(-0600)] <jhung> okay.
[12:38:30 CST(-0600)] <jhung> https://bitbucket.org/hasan/genpdf
[12:38:33 CST(-0600)] <jhung> justin_o
[12:38:37 CST(-0600)] <Justin_o> jhung: thanks
[12:40:43 CST(-0600)] <Justin_o> jhung: i think i know why
[12:40:54 CST(-0600)] <Justin_o> jhung: hasan's branch has 4 heads
[12:41:00 CST(-0600)] <jhung> ah.
[12:42:21 CST(-0600)] <jhung> This is going to be funny because Hasan's still coding in his repo.
[12:43:26 CST(-0600)] <jhung> So we should merge heads in Hasan's repo, no?
[12:45:34 CST(-0600)] <Justin_o> hmm.. we could i guess
[12:45:38 CST(-0600)] <Justin_o> i wonder what he did
[12:50:16 CST(-0600)] <jhung> http://pastebin.com/2GijZbw5
[12:50:20 CST(-0600)] <jhung> justin_o ^
[12:51:18 CST(-0600)] <jhung> so it looks like the last common parent was changeset 39?
[12:52:37 CST(-0600)] <Justin_o> jhung: looks like it, so he basically worked off of decapod 0.4 and totally ignored all of michael and joost's work after that point
[12:53:18 CST(-0600)] <jhung> yeah. I recall he cut and pasted stuff, but nothing that would be recorded with hg.
[12:53:19 CST(-0600)] <Justin_o> jhung: i don't think there is a point to merge heads at this point
[12:53:25 CST(-0600)] <jhung> yeah
[12:53:33 CST(-0600)] <Justin_o> we'll have to get him to look at that later
[12:54:15 CST(-0600)] <jhung> so I guess it's good that his code will become the new tip in the sub repo. It's the code we want people to get by default.
[12:54:43 CST(-0600)] <Justin_o> jhung: yes
[13:01:54 CST(-0600)] <jhung> justin_o: okay, I'm going to commit this to the master and push it up...
[13:03:08 CST(-0600)] <Justin_o> jhung: thanks
[13:03:52 CST(-0600)] <Justin_o> jhung: once i get this UI stuff done i'll try to clean out my vm and start over again with this new code
[13:04:11 CST(-0600)] <jhung> justin_o sounds good!
[13:12:14 CST(-0600)] <jhung> justin_o: hg status from my master repo says nothing has changed.
[13:12:29 CST(-0600)] <jhung> justin_o: I think I may have to push it out from the sub repo.
[13:12:30 CST(-0600)] <Justin_o> jhung: after you did the merge?
[13:12:36 CST(-0600)] <jhung> yes
[13:12:53 CST(-0600)] <Justin_o> did you commit yet?
[13:12:56 CST(-0600)] <Justin_o> anywhere?
[13:13:29 CST(-0600)] <jhung> I can't commit because it tells me nothing has changed. 
[13:13:51 CST(-0600)] <jhung> justin_o: stepping away, back in a bit.
[13:14:13 CST(-0600)] <Justin_o> jhung: hmm.. okay ping me when you're back
[13:35:06 CST(-0600)] <jhung> back justin_o
[13:35:29 CST(-0600)] <Justin_o> jhung: hello.. i'm burning the ubuntu 10.04 images now
[13:35:33 CST(-0600)] <Justin_o> i'm making 4 copies
[13:35:54 CST(-0600)] <jhung> justin_o: great!
[13:36:38 CST(-0600)] <jhung> justin_o: I'm going to try to figure out this issue now with my repos. My genpdf sub repo is showing no changes too.
[13:36:48 CST(-0600)] <Justin_o> jhung: so if the merge didn't' require a merge commit, i guess you'll have to follow colinclark's steps from the e-mail he sent hasan earlier about getting the default repo back insync
[13:37:13 CST(-0600)] <Justin_o> jhung: but it is updated to the correct change set right?
[13:37:59 CST(-0600)] <jhung> yes, the sub repo has been updated. I see the 4th head / tip with Hasan's code.
[13:38:22 CST(-0600)] <jhung> I'll take a look at colinclark's email now...
[13:45:46 CST(-0600)] <jhung> for those interested in seeing some of the cool stuff IUPR us cooking up in Decapod, check out these two images...
[13:45:50 CST(-0600)] <jhung> https://lh3.googleusercontent.com/-inMc1lM35Gk/TsUrehV24_I/AAAAAAAAABs/x_KWumuA_-c/s890/Screenshot.png
[13:45:58 CST(-0600)] <jhung> https://lh6.googleusercontent.com/-kQrxFno1Bqo/TsUwRqvpU_I/AAAAAAAAACE/kXqSFnJswtc/s912/Screenshot-1.png
[13:46:58 CST(-0600)] <jhung> This shows a reconstructed page from a pair of cameras shooting in stereo. The first image shows the 3d model, the 2nd image shows the page image mapped to the model.
[13:47:28 CST(-0600)] <jhung> (Martin @ IUPR just passed these along to me)
[13:54:50 CST(-0600)] <Justin_o> jhung: those are pretty cool